feat(build): qt6 port + qml / qt3d removal

This is a port from Qt 5 to Qt 6.

Included:
- Use new Qt 6 VCPKG and Qt 6 docker image
- Updated many dependencies due to VCPKG update
- Removed QML, Qt3D

Also:
- Removed deprecated boost::asio::io_service
- Fixed rare race condition in worker_asio
- Fixed selector
- Fixed http post test
- Fixed video_controls GUI tests
- Fixed cardinal layout main title
- Sequencer widget reimplementation
- Removed CMake warnings and deprecated code

Author: dweckmann

.gitlab-ci.yml

@@ -7,10 +7,10 @@ stages:
 
 include:
     - project: "sight/sight-gitlab"
-      ref: 8d212bf32b05fbf1dcf714d70fc870995723392c
+      ref: cedfea7a6437cb7c31e6cac1ca58e6428e9cb2cc
       file: "/.templates/deploy.yml"
     - project: "sight/sight-gitlab"
-      ref: 8d212bf32b05fbf1dcf714d70fc870995723392c
+      ref: cedfea7a6437cb7c31e6cac1ca58e6428e9cb2cc
       file: "/.templates/build.yml"
 
 lint:ubuntu-24.04:

CMakeLists.txt

@@ -12,17 +12,20 @@ cmake_policy(SET CMP0063 NEW)
 cmake_policy(SET CMP0057 NEW)
 # Use new policy to use CMAKE_CXX_STANDARD in try_compile() macro
 cmake_policy(SET CMP0067 NEW)
-# Use old policy for Documentation to add cache variables and find VTK documentation dependent packages.
-# (Needed for doxygen..)
-cmake_policy(SET CMP0106 OLD)
 # Use new policy for CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
 cmake_policy(SET CMP0141 NEW)
-# Use old policy for now because of openCV
-cmake_policy(SET CMP0146 OLD)
 
-if(${CMAKE_VERSION} VERSION_GREATER "3.25.0")
-    # Transform the ``DEPFILE`` after running the custom command for Ninja generator.
-    cmake_policy(SET CMP0116 OLD)
+if(${CMAKE_VERSION} VERSION_GREATER "3.31.0")
+    # Use new policy for removed FindBoost module
+    cmake_policy(SET CMP0167 NEW)
+    # Use new policy for empty string variable after a single-value keyword
+    cmake_policy(SET CMP0174 NEW)
+    # Use new policy for normalized install() DESTINATION paths
+    cmake_policy(SET CMP0177 NEW)
+else()
+    # Use old policy for Documentation to add cache variables and find VTK documentation dependent packages.
+    # (Needed for doxygen..)
+    cmake_policy(SET CMP0106 OLD)
 endif()
 
 # On Windows, if the user doesn't specify a value,
@@ -44,7 +47,7 @@ endif()
 
 project(
     sight
-    VERSION 24.0.0
+    VERSION 25.0.0
     DESCRIPTION "Surgical Image Guidance and Healthcare Toolkit"
     HOMEPAGE_URL "https://git.ircad.fr/sight/sight"
 )
@@ -69,8 +72,14 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build/flags.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build/macros.cmake)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/build/linux/modules)
 
+# We need to find Qt6 before ITK/VTK, otherwise they find Qt5 and CMake fails with a cryptic
+# "Targets not yet defined: Qt::XXXXPrivate", even if we don't use ITK-Qt or VTK-Qt extensions
+if(UNIX)
+    find_package(Qt6 CONFIG QUIET COMPONENTS Core Gui Widgets OpenGL)
+endif()
+
 # We find VTK to know its version so we can enable PCL or not
-find_package(VTK CONFIG QUIET REQUIRED)
+find_package(VTK CONFIG QUIET)
 
 ########################################################################################################################
 # User options
@@ -109,10 +118,6 @@ if(SIGHT_ENABLE_CLANG_TIDY)
     set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 endif()
 
-# QML_IMPORT_PATH allows qtCreator to find the qml modules created in our modules
-set(QML_IMPORT_PATH "" CACHE STRING "Path of the Qml modules." FORCE)
-mark_as_advanced(QML_IMPORT_PATH)
-
 if(CMAKE_CONFIGURATION_TYPES)
     set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE STRING "List of supported configurations." FORCE)
 endif()
@@ -210,14 +215,16 @@ sight_configure_pch()
 
 add_subdirectory(libs)
 add_subdirectory(modules)
-add_subdirectory(configs)
 add_subdirectory(activities)
+add_subdirectory(configs)
 add_subdirectory(utils)
 add_subdirectory(apps)
+
 if(SIGHT_BUILD_EXAMPLES)
     add_subdirectory(tutorials)
     add_subdirectory(examples)
 endif()
+
 add_subdirectory(3rd-party)
 
 ########################################################################################################################

activities/viz/negato/rc/configurations/2d_negato.xml

@@ -7,7 +7,6 @@
         <param name="patient_name" default="" />
         <!-- axial, frontal, sagittal -->
         <param name="orientation" default="axial" />
-        <param name="CrossTypeChannel" default="crossTypeChannel" />
         <param name="PickingChannel" default="pickingChannel" />
     </parameters>
     <config>
@@ -148,10 +147,6 @@
             <backends enable="all" mode="best" />
         </service>
 
-        <connect channel="${CrossTypeChannel}">
-            <slot>MPRNegato/set_cross_scale</slot>
-        </connect>
-
         <connect channel="${PickingChannel}">
             <signal>pickerInteractorAdp/picked</signal>
         </connect>

activities/viz/negato/rc/configurations/2d_negato_with_tf.xml

@@ -8,7 +8,6 @@
         <param name="patient_name" default="" />
         <!-- axial, frontal, sagittal -->
         <param name="orientation" default="axial" />
-        <param name="CrossTypeChannel" default="crossTypeChannel" />
         <param name="PickingChannel" default="pickingChannel" />
     </parameters>
     <config>
@@ -136,10 +135,6 @@
             <slot>multiDistances/create_distance</slot>
         </connect>
 
-        <connect channel="${CrossTypeChannel}">
-            <slot>MPRNegato/set_cross_scale</slot>
-        </connect>
-
         <connect channel="${PickingChannel}">
             <signal>pickerInteractor/picked</signal>
         </connect>

activities/viz/negato/rc/configurations/2d_visualization.xml

@@ -49,7 +49,6 @@
                 <key name="image" uid="${imageSeries}" />
             </inout>
             <parameter replace="WID_PARENT" by="view_negato1" />
-            <parameter replace="CrossTypeChannel" by="crossTypeChannel" />
             <parameter replace="PickingChannel" by="pickerChannel" />
             <parameter replace="orientation" by="axial" />
         </service>
@@ -60,7 +59,6 @@
                 <key name="image" uid="${imageSeries}" />
             </inout>
             <parameter replace="WID_PARENT" by="view_negato2" />
-            <parameter replace="CrossTypeChannel" by="crossTypeChannel" />
             <parameter replace="PickingChannel" by="pickerChannel" />
             <parameter replace="orientation" by="frontal" />
         </service>
@@ -71,7 +69,6 @@
                 <key name="image" uid="${imageSeries}" />
             </inout>
             <parameter replace="WID_PARENT" by="view_negato3" />
-            <parameter replace="CrossTypeChannel" by="crossTypeChannel" />
             <parameter replace="PickingChannel" by="pickerChannel" />
             <parameter replace="orientation" by="sagittal" />
         </service>

apps/sight_viewer/test/uit/test.cpp

@@ -1,6 +1,6 @@
 /************************************************************************
  *
- * Copyright (C) 2022-2024 IRCAD France
+ * Copyright (C) 2022-2025 IRCAD France
  *
  * This file is part of Sight.
  *
@@ -62,6 +62,9 @@ void test::open_file(
     // Fill the file dialog, tap PATH
     helper::file_dialog::fill(_tester, _path);
 
+    // Ensure the image loading is started, otherwise it will hang the test.
+    QTest::qWait(1000);
+
     if(_format == "DICOM" || _format == "Nifti or Inr images")
     {
         // The Show/hide volume button becomes enabled when the image effectively shows up.

cmake/build/download_deps.cmake

@@ -40,19 +40,19 @@ if(WIN32)
     endif()
 
     if(NOT SIGHT_DEPS_PACKAGE)
-        set(SIGHT_DEPS_PACKAGE "${SIGHT_DEPS_BASENAME}-c9fd19ca")
+        set(SIGHT_DEPS_PACKAGE "${SIGHT_DEPS_BASENAME}-05c97253")
     endif()
 
     if(NOT SIGHT_DEPS_ARCHIVE)
         set(SIGHT_DEPS_ARCHIVE "${SIGHT_DEPS_PACKAGE}.7z")
     endif()
 
     if(NOT SIGHT_DEPS_PUBLIC_URL)
-        set(SIGHT_DEPS_PUBLIC_URL "https://cloud.ircad.fr/s/eJSsTCkjtitymFD/download")
+        set(SIGHT_DEPS_PUBLIC_URL "https://cloud.ircad.fr/s/59cbTgwnnLYWrfA/download")
     endif()
 
     if(NOT SIGHT_DEPS_ARCHIVE_HASH)
-        set(SIGHT_DEPS_ARCHIVE_HASH "01285f0d8c71828417d3de76dad2f0d52ad2406fa2b2f65c40b0088b72d45d2a")
+        set(SIGHT_DEPS_ARCHIVE_HASH "7B60B8D49BF7BD108AEE96A4F8D1D6BBA3D4F6C241D185746079E99A965A73E4")
     endif()
 
     # By default, we avoid to download binary packages inside the build tree on windows

cmake/build/flags.cmake

@@ -105,19 +105,14 @@ add_compile_definitions("$<$<CONFIG:MinSizeRel,Release,RelWithDebInfo>:NDEBUG>")
 
 # Add a global definition to silence a windows warning when using boost, saying _WIN32_WINNT is not defined.
 # Beware this must match the value used to compile BOOST, otherwise libraries that uses Boost::Log will NOT link.
-add_compile_definitions("$<$<CXX_COMPILER_ID:MSVC>:WINVER=0x0601>")
-add_compile_definitions("$<$<CXX_COMPILER_ID:MSVC>:_WIN32_WINNT=0x0601>")
-add_compile_definitions("$<$<CXX_COMPILER_ID:MSVC>:BOOST_USE_WINAPI_VERSION=0x0601>")
+add_compile_definitions("$<$<CXX_COMPILER_ID:MSVC>:_WIN32_WINNT=0x0A00>")
 
 # Avoid conflicts with std::min / std::max when including windows.h
 add_compile_definitions("$<$<CXX_COMPILER_ID:MSVC>:NOMINMAX>")
 
 # Suppress MSVC specific warnings
 add_compile_definitions("$<$<CXX_COMPILER_ID:MSVC>:_ENABLE_EXTENDED_ALIGNED_STORAGE>")
 
-# We need this because of OgreUTFString.h, which is removed in more recent Ogre versions
-add_compile_definitions("$<$<CXX_COMPILER_ID:MSVC>:_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING>")
-
 #
 # Options: Warnings
 #
@@ -302,6 +297,10 @@ if(MSVC)
     # CMAKE_MSVC_DEBUG_INFORMATION_FORMAT doesn't always work
     replace_flags("/Z[iI]" "/Z7")
 
+    # Force source file encoding to UTF-8 to ignore changes from dependencies like Qt6, which may break PCH or CCache
+    add_compile_options("$<$<AND:$<CXX_COMPILER_ID:MSVC>,$<COMPILE_LANGUAGE:C,CXX>>:/utf-8>")
+    add_compile_options("$<$<AND:$<CXX_COMPILER_ID:MSVC>,$<COMPILE_LANGUAGE:CUDA>>:-Xcompiler=-utf-8>")
+
     # On MSVC, we want different optimizations depending on the target
     # CMake does allow us to override CXX_FLAGS, so we reset them here and
     # restore them later, modified or not, in restore_cxx_flags()

cmake/build/macros.cmake

@@ -1286,26 +1286,14 @@ function(sight_create_package_targets SIGHT_COMPONENTS SIGHT_IMPORTED_COMPONENTS
 
         # Add a fixup target for every app
         if(WIN32)
-
-            # Determine if we need to copy Qml plugins
-            find_target_dependencies(${APP} "${SIGHT_COMPONENTS};${SIGHT_IMPORTED_COMPONENTS}" DEPENDS_FOR_QML)
-            foreach(DEP ${DEPENDS_FOR_QML})
-                get_target_property(LINKED_DEPENDS ${DEP} LINK_LIBRARIES)
-                if("${DEP}" MATCHES "sight::module_ui_qt" OR "${LINKED_DEPENDS}" MATCHES "Qml")
-                    set(QML_SOURCE_DIR "${Qt5_DIR}/../../..$<$<CONFIG:Debug>:/debug>/qml")
-                    break()
-                endif()
-            endforeach()
-
             list(APPEND DEPENDS ${IMPORTED_DEPENDS})
             list(REMOVE_DUPLICATES DEPENDS)
             add_custom_target(
                 ${APP}_install_plugins
                 ${CMAKE_COMMAND}
                 -DDEPENDS="${DEPENDS}"
                 -DBUILD_TYPE=${CMAKE_BUILD_TYPE}
-                -DQT_PLUGINS_SOURCE_DIR="${Qt5_DIR}/../../..$<$<CONFIG:Debug>:/debug>/plugins"
-                -DQML_SOURCE_DIR="${QML_SOURCE_DIR}"
+                -DQT_PLUGINS_SOURCE_DIR="${Qt6_DIR}/../..$<$<CONFIG:Debug>:/debug>/Qt6/plugins"
                 -DQT_DESTINATION="${CMAKE_INSTALL_BINDIR}/.."
                 -DOGRE_PLUGIN_DIR="${OGRE_PLUGIN_DIR}"
                 -DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}"

cmake/build/sightConfig.cmake.in

@@ -3,6 +3,21 @@ cmake_minimum_required (VERSION 3.18)
 # Use new policy to use CMAKE_CXX_STANDARD in trysight_compile() macro
 cmake_policy(SET CMP0067 NEW)
 
+if(${CMAKE_VERSION} VERSION_GREATER "3.31.0")
+    # Use new policy for removed FindBoost module
+    cmake_policy(SET CMP0167 NEW)
+    # Use new policy for empty string variable after a single-value keyword
+    cmake_policy(SET CMP0174 NEW)
+    # Use new policy for normalized install() DESTINATION paths
+    cmake_policy(SET CMP0177 NEW)
+endif()
+
+# We need to find Qt6 before ITK/VTK, otherwise they find Qt5 and CMake fails with a cryptic
+# "Targets not yet defined: Qt::XXXXPrivate", even if we don't use ITK-Qt or VTK-Qt extensions
+if(UNIX)
+    find_package(Qt6 CONFIG QUIET COMPONENTS Core Gui Widgets OpenGL)
+endif()
+
 set(FW_BUILD_EXTERNAL 1)
 
 include(GNUInstallDirs)
@@ -37,7 +52,6 @@ if(NOT SIGHT_CONFIGURED)
             COPYONLY
         )
     endif()
-    
 
     set(FW_INSTALL_PATH_SUFFIX "${PROJECT_NAME}")
     set(FWCONFIG_PACKAGE_LOCATION lib/cmake/${PROJECT_NAME})

cmake/install/windows/install_plugins.cmake

@@ -2,15 +2,11 @@ cmake_policy(SET CMP0057 NEW)
 
 include(GNUInstallDirs)
 
-# install all Qt5 plugins
+# install all Qt6 plugins
 if(${DEPENDS} MATCHES "_qt")
     message(STATUS "Install Qt plugins from '${QT_PLUGINS_SOURCE_DIR}'")
     file(INSTALL DESTINATION ${CMAKE_INSTALL_PREFIX}/${QT_DESTINATION} TYPE DIRECTORY FILES ${QT_PLUGINS_SOURCE_DIR})
 endif()
-if(QML_SOURCE_DIR)
-    message(STATUS "Install Qml plugins from '${QML_SOURCE_DIR}'")
-    file(INSTALL DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR} TYPE DIRECTORY FILES ${QML_SOURCE_DIR})
-endif()
 
 if(${DEPENDS} MATCHES "viz_scene3d ")
     if("${BUILD_TYPE}" STREQUAL "Debug")

cmake/install/windows/windows_fixup.cmake.in

@@ -4,15 +4,14 @@ cmake_policy(SET CMP0053 NEW)
 
 include(@FWCMAKE_INSTALL_FILES_DIR@/helper.cmake)
 
-# Find all *.dll in /bin, Qt5 plugins and Ogre plugins
+# Find all *.dll in /bin, Qt6 plugins and Ogre plugins
 file(GLOB_RECURSE MODULES "@CMAKE_INSTALL_PREFIX@/@SIGHT_MODULE_LIB_PREFIX@/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
 file(GLOB_RECURSE QT_PLUGINS "@CMAKE_INSTALL_PREFIX@/plugins/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
-file(GLOB_RECURSE QML_PLUGINS "@CMAKE_INSTALL_PREFIX@/qml/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
 file(GLOB_RECURSE OGRE_PLUGINS "@CMAKE_INSTALL_PREFIX@/ogreplugins/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
 
 include(BundleUtilities)
 
-list(APPEND LIBS ${MODULES} ${QT_PLUGINS} ${QML_PLUGINS} ${OGRE_PLUGINS})
+list(APPEND LIBS ${MODULES} ${QT_PLUGINS} ${OGRE_PLUGINS})
 # Also add modules from the SDK
 if(@FW_BUILD_EXTERNAL@)
 

examples/core/ex_activities/CMakeLists.txt

@@ -21,10 +21,10 @@ add_dependencies(
     module_data
 )
 
-# Allow dark theme via module_ui_qt
+# Allow noctura theme via module_ui_qt
 module_param(
-    module_ui_qt PARAM_LIST resource stylesheet PARAM_VALUES sight::module::ui::qt/flatdark.rcc
-                                                             sight::module::ui::qt/flatdark.qss
+    module_ui_qt PARAM_LIST resource stylesheet touch_friendly PARAM_VALUES sight::module::ui::qt/noctura.rcc
+                                                                            sight::module::ui::qt/noctura.qss true
 )
 
 # Main application's configuration to launch

examples/ui/ex_collapsible_section/CMakeLists.txt

@@ -1,10 +1,13 @@
 sight_add_target(ex_collapsible_section TYPE APP)
 
-add_dependencies(ex_collapsible_section sightrun module_app module_ui module_ui_qt module_service)
-find_package(Qt5 QUIET COMPONENTS Core Gui Widgets REQUIRED)
-target_link_libraries(ex_collapsible_section PUBLIC ui Qt5::Core Qt5::Gui Qt5::Widgets)
+find_package(Qt6 QUIET COMPONENTS Widgets REQUIRED)
+target_link_libraries(${SIGHT_TARGET} PRIVATE Qt6::Widgets)
+set_target_properties(${SIGHT_TARGET} PROPERTIES AUTOMOC TRUE)
+target_compile_definitions(${SIGHT_TARGET} PUBLIC "QT_NO_KEYWORDS")
 
-target_link_libraries(ex_collapsible_section PUBLIC service ui_qt)
+target_link_libraries(${SIGHT_TARGET} PUBLIC service ui_qt)
+
+add_dependencies(${SIGHT_TARGET} sightrun module_app module_ui module_ui_qt module_service)
 
 # Main application's configuration to launch
 module_param(module_app PARAM_LIST config PARAM_VALUES ex_collapsible_section_app_cfg)

libs/__/activity/extension/activity.cpp

@@ -1,6 +1,6 @@
 /************************************************************************
  *
- * Copyright (C) 2009-2024 IRCAD France
+ * Copyright (C) 2009-2025 IRCAD France
  * Copyright (C) 2012-2020 IHU Strasbourg
  *
  * This file is part of Sight.
@@ -84,9 +84,13 @@ activity_requirement::activity_requirement(const config_t& _config) :
     description(_config.get<std::string>("desc", "")),
     validator(_config.get<std::string>("validator", "")),
     min_occurs(_config.get<unsigned int>("<xmlattr>.minOccurs", 1)),
-    max_occurs(_config.get<unsigned int>("<xmlattr>.maxOccurs", 1)),
-    object_config(_config.get_child("config", config_t()))
+    max_occurs(_config.get<unsigned int>("<xmlattr>.maxOccurs", 1))
 {
+    if(const auto& optional = _config.get_child_optional("config"); optional)
+    {
+        object_config = *optional;
+    }
+
     for(const auto& v : boost::make_iterator_range(_config.equal_range("key")))
     {
         keys.emplace_back(v.second);