Feature/qt6 compatibility

.github/workflows/build-ubuntu-20.yml

@@ -60,7 +60,7 @@ jobs:
         cmake $GITHUB_WORKSPACE -G "Ninja" \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
         -DHAS_HDF5=ON \
-        -DHAS_QT5=ON \
+        -DHAS_QT=ON \
         -DHAS_CURL=ON \
         -DHAS_CAPNPROTO=ON \
         -DHAS_FTXUI=ON \

.github/workflows/build-ubuntu-22.yml

@@ -60,7 +60,7 @@ jobs:
         cmake $GITHUB_WORKSPACE -G "Ninja" \
         -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
         -DHAS_HDF5=ON \
-        -DHAS_QT5=ON \
+        -DHAS_QT=ON \
         -DHAS_CURL=ON \
         -DHAS_CAPNPROTO=ON \
         -DHAS_FTXUI=ON \

.github/workflows/build-windows.yml

@@ -22,9 +22,9 @@ jobs:
       uses: jurplel/install-qt-action@v3
       with:
         setup-python: 'false'
-        version: '5.15.2'
+        version: '6.6.1'
         target: 'desktop'
-        arch: 'win64_msvc2015_64'
+        arch: 'win64_msvc2019_64'
 
     # Downgrading nuget is required as of 2021-04-23, as nuget 5.9.1.111 fails installing protobuf
     # https://github.com/actions/virtual-environments/issues/3240
@@ -91,7 +91,7 @@ jobs:
 
         cmake %GITHUB_WORKSPACE% -G "Visual Studio 16 2019" -A x64 -T v142 ^
         -DHAS_HDF5=ON ^
-        -DHAS_QT5=ON ^
+        -DHAS_QT=ON ^
         -DHAS_CURL=OFF ^
         -DHAS_CAPNPROTO=OFF ^
         -DHAS_FTXUI=ON ^
@@ -131,7 +131,7 @@ jobs:
         cd "${{ runner.workspace }}/_build/complete"
         cmake %GITHUB_WORKSPACE% -G "Visual Studio 16 2019" -A x64 -T v142 ^
         -DHAS_HDF5=ON ^
-        -DHAS_QT5=ON ^
+        -DHAS_QT=ON ^
         -DHAS_CURL=ON ^
         -DHAS_CAPNPROTO=OFF ^
         -DHAS_FTXUI=ON ^

CMakeLists.txt

@@ -69,7 +69,14 @@ endif()
 # use it that way cmake .. -DBUILD_APPS=ON -DBUILD_SAMPLES=ON
 # --------------------------------------------------------
 option(HAS_HDF5                                "Platform supports HDF5 library"                                    ON)
-option(HAS_QT5                                 "Platform supports Qt 5 library"                                    ON)
+option(HAS_QT                                  "Platform supports Qt 5 / 6 library."                               ON)
+
+# If the user set the legacy HAS_QT5 option, but didn't set the new HAS_QT option, set it to the value of HAS_QT5
+if(DEFINED HAS_QT5 AND NOT DEFINED HAS_QT)
+  set(HAS_QT ${HAS_QT5})
+  message(WARNING "The option HAS_QT5 is deprecated and may be removed at any time. Please use HAS_QT instead.")
+endif()
+
 option(HAS_CURL                                "Build with CURL (i.e. upload support in the recorder app)"         ON)
 option(HAS_CAPNPROTO                           "Platform supports Cap'n Proto library"                            OFF)
 option(HAS_FLATBUFFERS                         "Platform supports flatbuffers library"                            OFF)
@@ -112,12 +119,12 @@ if(WIN32)
   option(ECAL_THIRDPARTY_BUILD_YAML-CPP        "Build yaml-cpp with eCAL"                                          ON)
   option(ECAL_THIRDPARTY_BUILD_CURL            "Build CURL with eCAL"                                              ON)
   option(ECAL_THIRDPARTY_BUILD_HDF5            "Build HDF5 with eCAL"                                              ON)
-  cmake_dependent_option(ECAL_THIRDPARTY_BUILD_QWT "Build qwt::qwt with eCAL"                                      ON  "HAS_QT5" OFF)
+  cmake_dependent_option(ECAL_THIRDPARTY_BUILD_QWT "Build qwt::qwt with eCAL"                                      ON  "HAS_QT" OFF)
 else()
   option(ECAL_THIRDPARTY_BUILD_PROTOBUF        "Build protobuf with eCAL"                                         OFF)
   option(ECAL_THIRDPARTY_BUILD_CURL            "Build CURL with eCAL"                                             OFF)
   option(ECAL_THIRDPARTY_BUILD_HDF5            "Build HDF5 with eCAL"                                             OFF)
-  cmake_dependent_option(ECAL_THIRDPARTY_BUILD_QWT "Build qwt::qwt with eCAL"                                     OFF "HAS_QT5" OFF)
+  cmake_dependent_option(ECAL_THIRDPARTY_BUILD_QWT "Build qwt::qwt with eCAL"                                     OFF "HAS_QT" OFF)
   option(ECAL_THIRDPARTY_BUILD_YAML-CPP        "Build yaml-cpp with eCAL"                                         OFF)
 endif()
 
@@ -217,10 +224,10 @@ find_package(CMakeFunctions REQUIRED)
 # detect qt library
 # --------------------------------------------------------
 if(MSVC)
-  if (HAS_QT5)
-    find_package(Qt5 COMPONENTS Core QUIET)
-    if (NOT "${Qt5_FOUND}")
-      autodetect_qt5_msvc_dir()
+  if (HAS_QT)
+    find_package(QT NAMES Qt6 Qt5 COMPONENTS Core QUIET)
+    if (NOT "${QT_FOUND}")
+      autodetect_qt_msvc_dir()
     endif()
   endif()
 endif()
@@ -329,20 +336,20 @@ add_subdirectory(lib/ThreadingUtils)
 add_subdirectory(lib/CustomTclap)
 add_subdirectory(lib/ecal_utils)
 
-if(HAS_QT5)
+if(HAS_QT)
   add_subdirectory(lib/CustomQt)
 endif()
 add_subdirectory(lib/EcalParser)
-if(HAS_QT5)
+if(HAS_QT)
   add_subdirectory(lib/QEcalParser)
-endif(HAS_QT5)
+endif()
 
 # --------------------------------------------------------
 # ecal mon plugin sdk
 # --------------------------------------------------------
-if(HAS_QT5)
+if(HAS_QT)
   add_subdirectory(app/mon/mon_plugin_lib)
-endif(HAS_QT5)
+endif()
 
 # --------------------------------------------------------
 # ecal rec addon sdk
@@ -422,7 +429,7 @@ endif()
 # --------------------------------------------------------
 # qt applications
 # --------------------------------------------------------
-if(BUILD_APPS AND HAS_QT5)
+if(BUILD_APPS AND (HAS_QT))
   add_subdirectory(app/sys/sys_gui)
   add_subdirectory(app/mon/mon_gui)
   if(WIN32)
@@ -432,13 +439,14 @@ if(BUILD_APPS AND HAS_QT5)
   endif()
   add_subdirectory(app/mon/mon_plugins)
   add_subdirectory(app/util/launcher)
-# --------------------------------------------------------
-# qt applications using hdf5
-# --------------------------------------------------------
-if(BUILD_APPS AND HAS_QT5 AND HAS_HDF5)
-  add_subdirectory(app/play/play_gui)
-  add_subdirectory(app/rec/rec_gui)
-endif()
+
+  # --------------------------------------------------------
+  # qt applications using hdf5
+  # --------------------------------------------------------
+  if(HAS_HDF5)
+    add_subdirectory(app/play/play_gui)
+    add_subdirectory(app/rec/rec_gui)
+  endif()
 endif()
 
 # --------------------------------------------------------
@@ -481,7 +489,7 @@ if(BUILD_ECAL_TESTS)
   # ------------------------------------------------------
   # test apps
   # ------------------------------------------------------
-  if (HAS_HDF5 AND HAS_QT5)
+  if (HAS_HDF5 AND HAS_QT)
     add_subdirectory(app/rec/rec_tests/rec_rpc_tests)
   endif()
 endif()
@@ -552,7 +560,7 @@ message(STATUS "Build Options:")
 message(STATUS "--------------------------------------------------------------------------------")
 message(STATUS "CMAKE_EXPORT_COMPILE_COMMANDS                  : ${CMAKE_EXPORT_COMPILE_COMMANDS}")
 message(STATUS "HAS_HDF5                                       : ${HAS_HDF5}")
-message(STATUS "HAS_QT5                                        : ${HAS_QT5}")
+message(STATUS "HAS_QT                                         : ${HAS_QT}")
 message(STATUS "HAS_CURL                                       : ${HAS_CURL}")
 message(STATUS "HAS_CAPNPROTO                                  : ${HAS_CAPNPROTO}")
 message(STATUS "HAS_FLATBUFFERS                                : ${HAS_FLATBUFFERS}")

app/mon/mon_gui/CMakeLists.txt

@@ -16,12 +16,19 @@
 #
 # ========================= eCAL LICENSE =================================
 
+cmake_minimum_required(VERSION 3.14)
+
+# Allow the install command to use generator expressions
+if(POLICY CMP0087)
+    cmake_policy(SET CMP0087 NEW)
+endif()
+
 project(mon_gui)
 
-find_package(Qt5 COMPONENTS
-    Core
-    Widgets
-REQUIRED)
+# Legacy Qt5 (pre 5.15) support as suggested by teh Qt Documentation:
+# https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html#supporting-older-qt-5-versions
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets)
 
 find_package(Protobuf REQUIRED)
 
@@ -169,10 +176,14 @@ if(ECAL_NPCAP_SUPPORT)
     )
 endif(ECAL_NPCAP_SUPPORT)
 
-
 # compile qt resource files and ui files
-qt5_add_resources(autogen_resources ${qt_resource_files})
-qt5_wrap_ui      (autogen_ui        ${ui_files})
+if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+    qt_add_resources(autogen_resources ${qt_resource_files})
+    qt_wrap_ui      (autogen_ui        ${ui_files})
+else()
+    qt5_add_resources(autogen_resources ${qt_resource_files})
+    qt5_wrap_ui      (autogen_ui        ${ui_files})
+endif()
 
 # Add all files. The resource files and ui files are not necessary, but we want them to show up in the IDE
 ecal_add_app_qt(${PROJECT_NAME} 
@@ -190,7 +201,8 @@ target_link_libraries (${PROJECT_NAME}
     eCAL::core
     eCAL::core_pb
     eCAL::mon_plugin_lib
-    Qt5::Widgets
+    Qt${QT_VERSION_MAJOR}::Core
+    Qt${QT_VERSION_MAJOR}::Widgets
     CustomQt
 )
 
@@ -217,9 +229,64 @@ target_include_directories(${PROJECT_NAME} PRIVATE src)
 target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:eCAL::core,INCLUDE_DIRECTORIES>)
 
 
-if(WIN32)
+if ((WIN32 OR APPLE) AND (${QT_VERSION_MAJOR} GREATER_EQUAL 6))
+
+    # Generate a script that will deploy all necessary Qt DLLs to the binary folder
+    # https://doc.qt.io/qt-6/qt-deploy-runtime-dependencies.html
+    # Available for Qt 6.3 and up (=> Not for Qt5!)
+    # Executing it requires CMake 3.14 and up, due to policy https://cmake.org/cmake/help/latest/policy/CMP0087.html
+    qt_generate_deploy_app_script(
+        TARGET ${PROJECT_NAME}
+        OUTPUT_SCRIPT qt_deploy_script
+        NO_COMPILER_RUNTIME
+        NO_UNSUPPORTED_PLATFORM_ERROR
+    )
+
+    # Add a postbuild script that will also execute the created script via cmake -P
+    # This is necessary to make the application startable / debuggable from the build directory.
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -DQT_DEPLOY_PREFIX=$<TARGET_FILE_DIR:${PROJECT_NAME}> -DQT_DEPLOY_BIN_DIR=. -P ${qt_deploy_script}
+    )
+
+    # Use the script for deploying the qt dlls in the install dir
+    install(SCRIPT ${qt_deploy_script})
+
+elseif(WIN32)
+
+    # For Qt5 we use our legacy script.
     # Deploy Qt DLLs in the binary folder. This is necessary for starting the application from whithin the IDE without having to copy QtCore.dll, QtWidgets.dll etc. by hand each time
     qt_add_windeployqt_postbuild(--no-system-d3d-compiler --no-compiler-runtime --no-opengl-sw --pdb "$<TARGET_FILE:${PROJECT_NAME}>")
+
+    get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+    get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
+    find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
+    install(CODE
+        "
+        set(_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/ecal_mon_gui.exe)
+        execute_process(
+                COMMAND \"${CMAKE_COMMAND}\" -E
+                    env PATH=\"${_qt_bin_dir}\" \"${WINDEPLOYQT_EXECUTABLE}\"
+                        --dry-run
+                        --no-compiler-runtime
+                        --no-angle
+                        --no-opengl-sw
+                        --list mapping
+                        \${_file}
+                OUTPUT_VARIABLE _output
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+        separate_arguments(_files WINDOWS_COMMAND \${_output})
+        while(_files)
+                list(GET _files 0 _src)
+                list(GET _files 1 _dest)
+                execute_process(
+                    COMMAND \"${CMAKE_COMMAND}\" -E
+                        copy \${_src} \"\${CMAKE_INSTALL_PREFIX}/bin/\${_dest}\"
+                )
+                list(REMOVE_AT _files 0 1)
+        endwhile()
+        "
+)
 endif()
 
 # Create a source tree that mirrors the filesystem
@@ -244,43 +311,4 @@ source_group( autogen FILES
 
 set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER app/mon)
 
-ecal_install_app(${PROJECT_NAME} START_MENU_NAME "eCAL Monitor")
-get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
-get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
-find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
-
-# Running this with MSVC 2015 requires CMake 3.6+
-if((MSVC_VERSION VERSION_EQUAL 1900 OR MSVC_VERSION VERSION_GREATER 1900)
-        AND CMAKE_VERSION VERSION_LESS "3.6")
-    message(WARNING "Deploying with MSVC 2015+ requires CMake 3.6+")
-endif()
-
-if(WIN32)
-install(CODE
-    "
-    set(_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Release/ecal_mon_gui.exe)
-    execute_process(
-            COMMAND \"${CMAKE_COMMAND}\" -E
-                env PATH=\"${_qt_bin_dir}\" \"${WINDEPLOYQT_EXECUTABLE}\"
-                    --dry-run
-                    --no-compiler-runtime
-                    --no-angle
-                    --no-opengl-sw
-                    --list mapping
-                    \${_file}
-            OUTPUT_VARIABLE _output
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    separate_arguments(_files WINDOWS_COMMAND \${_output})
-    while(_files)
-            list(GET _files 0 _src)
-            list(GET _files 1 _dest)
-            execute_process(
-                COMMAND \"${CMAKE_COMMAND}\" -E
-                    copy \${_src} \"\${CMAKE_INSTALL_PREFIX}/bin/\${_dest}\"
-            )
-            list(REMOVE_AT _files 0 1)
-    endwhile()
-    "
-)
-endif()
+ecal_install_app(${PROJECT_NAME} START_MENU_NAME "eCAL Monitor")

app/mon/mon_gui/src/ecalmon.cpp

@@ -35,14 +35,17 @@
 #include "plugin/plugin_manager.h"
 
 #include <QSettings>
-#include <QDesktopWidget>
 #include <QDesktopServices>
 #include <QDateTime>
 #include <QScreen>
 #include <QStyleFactory>
 #include <QLayout>
 #include <QUuid>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+#include <QDesktopWidget>
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+
 #ifndef NDEBUG
   #ifdef _MSC_VER
     #pragma warning(push)
@@ -698,7 +701,18 @@ void Ecalmon::resetLayout()
   setTheme(Theme::Dark);
 
   // Back when we saved the initial window geometry, the window-manager might not have positioned the window on the screen, yet
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
   int screen_number = QApplication::desktop()->screenNumber(this);
+#else
+  int screen_number = 0;
+  QScreen* current_screen = this->screen();
+  if (current_screen != nullptr)
+  {
+    screen_number = QApplication::screens().indexOf(current_screen);
+    if (screen_number < 0)
+      screen_number = 0;
+  }
+#endif // QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 
   restoreGeometry(initial_geometry_);
   restoreState(initial_state_);

app/mon/mon_gui/src/util.h

@@ -28,7 +28,11 @@ namespace QtUtil
 {
   inline QString variantToString(const QVariant& variant)
   {
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    switch (variant.typeId())
+#else
     switch ((QMetaType::Type)variant.type())
+#endif
     {
     case QMetaType::Bool:
       return variant.toBool() ? "True" : "False";

app/mon/mon_gui/src/widgets/ecalmon_tree_widget/process_widget.cpp

@@ -129,7 +129,7 @@ void ProcessWidget::autoSizeColumns()
   //example_process_pb.set_tsync_mode();
 
   ProcessTreeItem* example_process_item = new ProcessTreeItem(example_process_pb);
-  GroupTreeItem* example_group_item = new GroupTreeItem("HNAME00____", "", "", QVariant::Invalid, "");
+  GroupTreeItem* example_group_item = new GroupTreeItem("HNAME00____", "", "", QVariant(), "");
 
   process_tree_model_->insertItem(example_process_item);
   process_tree_model_->insertItem(example_group_item);