Qt6 migrations that are compatible with Qt5 (#598)

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
gazebosim · Dec 8, 2023 · 4c86af8 · 4c86af8
1 parent 91b50b8
commit 4c86af8
Show file tree

Hide file tree

Showing 25 changed files with 247 additions and 355 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -81,15 +81,19 @@ set(GZ_TOOLS_VER 2)
 
 #--------------------------------------
 # Find QT
-gz_find_package (Qt5
+set(QT_MAJOR_VERSION 5)
+set(QT_MINOR_VERSION 15)
+gz_find_package (Qt${QT_MAJOR_VERSION}
+  VERSION ${QT_MAJOR_VERSION}.${QT_MINOR_VERSION}
   COMPONENTS
     Core
     Quick
     QuickControls2
     Widgets
+    Test
   REQUIRED
-  PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets"
-)
+  PKGCONFIG "Qt${QT_MAJOR_VERSION}Core Qt${QT_MAJOR_VERSION}Quick Qt${QT_MAJOR_VERSION}QuickControls2 Qt${QT_MAJOR_VERSION}Widgets")
+add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00)
 
 set(GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR
   ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins

diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
 set (CMAKE_AUTOMOC ON)
 
 # Find Qt5
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -21,9 +21,7 @@ find_package (Qt5
 find_package(gz-gui9 REQUIRED)
 set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
-
-QT5_ADD_RESOURCES(resources_RCC CustomContext.qrc)
+qt_add_resources(resources_RCC CustomContext.qrc)
 
 # Generate examples
 add_library(CustomContext SHARED ${headers_MOC}
@@ -32,8 +30,4 @@ add_library(CustomContext SHARED ${headers_MOC}
 )
 target_link_libraries(CustomContext
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt
@@ -8,7 +8,6 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
 find_package (Qt5
   COMPONENTS
     Core
@@ -21,9 +20,7 @@ find_package (Qt5
 find_package(gz-gui9 REQUIRED)
 set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
-
-QT5_ADD_RESOURCES(resources_RCC DialogFromPlugin.qrc)
+qt_add_resources(resources_RCC DialogFromPlugin.qrc)
 
 # Generate examples
 add_library(DialogFromPlugin SHARED ${headers_MOC}
@@ -32,8 +29,4 @@ add_library(DialogFromPlugin SHARED ${headers_MOC}
 )
 target_link_libraries(DialogFromPlugin
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/gz_components/CMakeLists.txt b/examples/plugin/gz_components/CMakeLists.txt
@@ -8,7 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -21,7 +21,7 @@ set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
 
-QT5_ADD_RESOURCES(resources_RCC GzComponents.qrc)
+qt_add_resources(resources_RCC GzComponents.qrc)
 
 # Generate examples
 add_library(GzComponents SHARED ${headers_MOC}
@@ -30,8 +30,4 @@ add_library(GzComponents SHARED ${headers_MOC}
 )
 target_link_libraries(GzComponents
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt
@@ -8,8 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -21,9 +20,7 @@ find_package (Qt5
 find_package(gz-gui9 REQUIRED)
 set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
-
-QT5_ADD_RESOURCES(resources_RCC hello.qrc)
+qt_add_resources(resources_RCC hello.qrc)
 
 # Generate examples
 add_library(HelloPlugin SHARED ${headers_MOC}
@@ -32,8 +29,4 @@ add_library(HelloPlugin SHARED ${headers_MOC}
 )
 target_link_libraries(HelloPlugin
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/multiple_qml/CMakeLists.txt b/examples/plugin/multiple_qml/CMakeLists.txt
@@ -8,7 +8,6 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
 find_package (Qt5
   COMPONENTS
     Core
@@ -23,7 +22,7 @@ set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
 
-QT5_ADD_RESOURCES(resources_RCC MultipleQml.qrc)
+qt_add_resources(resources_RCC MultipleQml.qrc)
 
 # Generate examples
 add_library(MultipleQml SHARED ${headers_MOC}
@@ -32,8 +31,4 @@ add_library(MultipleQml SHARED ${headers_MOC}
 )
 target_link_libraries(MultipleQml
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/standalone/custom_drawer/CMakeLists.txt b/examples/standalone/custom_drawer/CMakeLists.txt
@@ -21,9 +21,7 @@ find_package (Qt5
 find_package(gz-gui9 REQUIRED)
 set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-QT5_ADD_RESOURCES(resources_RCC custom_drawer.qrc)
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
+qt_add_resources(resources_RCC custom_drawer.qrc)
 
 # Generate example
 add_executable(custom_drawer
@@ -32,8 +30,4 @@ add_executable(custom_drawer
 )
 target_link_libraries(custom_drawer
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/standalone/dialogs/CMakeLists.txt b/examples/standalone/dialogs/CMakeLists.txt
@@ -8,8 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -21,17 +20,10 @@ find_package (Qt5
 find_package(gz-gui9 REQUIRED)
 set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
-
 # Generate example
 add_executable(dialogs
   dialogs.cc
 )
 target_link_libraries(dialogs
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
-
diff --git a/examples/standalone/window/CMakeLists.txt b/examples/standalone/window/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
 set (CMAKE_AUTOMOC ON)
 
 # Find Qt5
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -29,9 +29,4 @@ add_executable(window
 )
 target_link_libraries(window
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
-
diff --git a/include/gz/gui/CMakeLists.txt b/include/gz/gui/CMakeLists.txt
@@ -1,26 +1,9 @@
-include_directories(
-  ${Qt5Core_INCLUDE_DIRS}
-  ${tinyxml_INCLUDE_DIRS}
-  ${Qt5Qml_INCLUDE_DIRS}
-  ${Qt5Quick_INCLUDE_DIRS}
-  ${Qt5QuickControls2_INCLUDE_DIRS}
-  ${Qt5Widgets_INCLUDE_DIRS}
-)
-
 if(POLICY CMP0100)
   cmake_policy(SET CMP0100 NEW)
 endif()
 
 set (CMAKE_AUTOMOC ON)
 
-add_definitions(
-  ${Qt5Core_DEFINITIONS}
-  ${Qt5Qml_DEFINITIONS}
-  ${Qt5Quick_DEFINITIONS}
-  ${Qt5QuickControls2_DEFINITIONS}
-  ${Qt5Widgets_DEFINITIONS}
-)
-
 set (qt_headers
   Application.hh
   Dialog.hh
@@ -42,8 +25,8 @@ set (headers
 
 set (resources resources.qrc)
 
-QT5_WRAP_CPP(headers_MOC ${qt_headers})
-QT5_ADD_RESOURCES(resources_RCC ${resources})
+qt_wrap_cpp(headers_MOC ${qt_headers})
+qt_add_resources(resources_RCC ${resources})
 
 gz_create_core_library(SOURCES
   ${sources}
@@ -67,13 +50,12 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
     gz-msgs${GZ_MSGS_VER}::gz-msgs${GZ_MSGS_VER}
     gz-plugin${GZ_PLUGIN_VER}::loader
     gz-transport${GZ_TRANSPORT_VER}::gz-transport${GZ_TRANSPORT_VER}
-    ${Qt5Core_LIBRARIES}
-    ${Qt5Qml_LIBRARIES}
-    ${Qt5Quick_LIBRARIES}
-    ${Qt5QuickControls2_LIBRARIES}
-    ${Qt5Widgets_LIBRARIES}
+    Qt::Core
+    Qt::Qml
+    Qt::Quick
+    Qt::QuickControls2
+    Qt::Widgets
     TINYXML2::TINYXML2
 )
 
 gz_install_all_headers()
-
diff --git a/src/Application.cc b/src/Application.cc
@@ -15,6 +15,7 @@
  *
  */
 
+#include <qsgrendererinterface.h>
 #include <tinyxml2.h>
 #include <queue>
 
@@ -126,7 +127,12 @@ Application::Application(int &_argc, char **_argv, const WindowType _type,
   {
     // Use the Metal graphics API on macOS.
     gzdbg << "Qt using Metal graphics interface" << std::endl;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QQuickWindow::setGraphicsApi(QSGRendererInterface::MetalRhi);
+#else
     QQuickWindow::setSceneGraphBackend(QSGRendererInterface::MetalRhi);
+#endif
+
   }
 
   // TODO(srmainwaring): implement facility for overriding the default
@@ -161,9 +167,11 @@ Application::Application(int &_argc, char **_argv, const WindowType _type,
 #  endif
     );
 
-#  if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2) && QT_CONFIG(vulkan)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QQuickWindow::setGraphicsApi(QSGRendererInterface::VulkanRhi);
+#else
     QQuickWindow::setSceneGraphBackend(QSGRendererInterface::VulkanRhi);
-#  endif
+#endif
   }
   else
   {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -54,7 +54,7 @@ gz_build_tests(TYPE UNIT
                   TINYXML2::TINYXML2
                 TEST_LIST
                   gtest_targets
-                ENVIRONMENT 
+                ENVIRONMENT
                   GZ_GUI_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
 )
 

diff --git a/src/Conversions.cc b/src/Conversions.cc
@@ -122,11 +122,7 @@ gz::common::MouseEvent convert(const QWheelEvent &_e)
   common::MouseEvent event;
 
   event.SetType(common::MouseEvent::SCROLL);
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-  event.SetPos(_e.x(), _e.y());
-#else
   event.SetPos(_e.position().x(), _e.position().y());
-#endif
   double scroll = (_e.angleDelta().y() > 0) ? -1.0 : 1.0;
   event.SetScroll(scroll, scroll);