Migrate to Qt6

.github/ci/packages.apt

@@ -10,22 +10,26 @@ libgz-utils3-dev
 libprotobuf-dev
 libprotoc-dev
 libtinyxml2-dev
-qml-module-qt-labs-folderlistmodel
-qml-module-qt-labs-platform
-qml-module-qt-labs-settings
-qml-module-qtcharts
-qml-module-qtgraphicaleffects
-qml-module-qtlocation
-qml-module-qtpositioning
-qml-module-qtqml-models2
-qml-module-qtquick-controls
-qml-module-qtquick-controls2
-qml-module-qtquick-dialogs
-qml-module-qtquick-layouts
-qml-module-qtquick-templates2
-qml-module-qtquick-window2
-qml-module-qtquick2
-qtbase5-dev
-qtdeclarative5-dev
-qtquickcontrols2-5-dev
+qml6-module-qt-labs-folderlistmodel
+qml6-module-qt-labs-platform
+qml6-module-qt-labs-settings
+qml6-module-qtcharts
+qml6-module-qtpositioning
+qml6-module-qtqml-models
+qml6-module-qtquick-controls
+qml6-module-qtquick-dialogs
+qml6-module-qtquick-layouts
+qml6-module-qtquick-templates
+qml6-module-qtquick-window
+qml6-module-qtquick
+qml6-module-qtqml
+qml6-module-qtcore
+qml6-module-qtqml-workerscript
+qml6-module-qt5compat-graphicaleffects
+libqt6svg6
+qt6-5compat-dev
+qt6-base-dev
+qt6-base-private-dev
+qt6-declarative-dev
+qt6-declarative-private-dev
 xvfb

CMakeLists.txt

@@ -80,8 +80,8 @@ set(GZ_TOOLS_VER 2)
 
 #--------------------------------------
 # Find QT
-set(QT_MAJOR_VERSION 5)
-set(QT_MINOR_VERSION 15)
+set(QT_MAJOR_VERSION 6)
+set(QT_MINOR_VERSION 4)
 gz_find_package (Qt${QT_MAJOR_VERSION}
   VERSION ${QT_MAJOR_VERSION}.${QT_MINOR_VERSION}
   COMPONENTS
@@ -93,7 +93,14 @@ gz_find_package (Qt${QT_MAJOR_VERSION}
   REQUIRED
   PKGCONFIG_VER_COMPARISON >=
   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(CMAKE_AUTOMOC TRUE)
+set(CMAKE_AUTOUIC TRUE)
+set(CMAKE_AUTORCC TRUE)
+if(POLICY CMP0100)
+  cmake_policy(SET CMP0100 NEW)
+endif()
 
 set(GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR
   ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins

examples/config/scene3d.config

@@ -78,7 +78,6 @@
     <property type="bool" key="showTitleBar">false</property>
     <property type="bool" key="resizable">false</property>
     <property type="double" key="height">72</property>
-    <property type="double" key="width">121</property>
     <property type="double" key="z">1</property>
 
     <property type="string" key="state">floating</property>

examples/plugin/custom_context_menu/CMakeLists.txt

@@ -9,7 +9,7 @@ endif()
 set (CMAKE_AUTOMOC ON)
 
 # Find Qt5
-find_package (Qt5 5.15
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

examples/plugin/dialog_from_plugin/CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-find_package (Qt5
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

examples/plugin/dialog_from_plugin/DialogFromPlugin.qml

@@ -16,7 +16,7 @@
 */
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQuick.Dialogs 1.0
+import QtQuick.Dialogs
 import QtQuick.Window 2.2
 
 Rectangle {

examples/plugin/gz_components/CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-find_package (Qt5 5.15
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

examples/plugin/hello_plugin/CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-find_package (Qt5 5.15
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

examples/plugin/multiple_qml/CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-find_package (Qt5
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

examples/standalone/custom_drawer/CMakeLists.txt

@@ -8,8 +8,8 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
-find_package (Qt5
+# Find Qt6
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

examples/standalone/dialogs/CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-find_package (Qt5 5.15
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

examples/standalone/start_dialog/CMakeLists.txt

@@ -12,7 +12,7 @@ find_package(gz-gui REQUIRED)
 
 set(EXEC_NAME "start_dialog")
 
-QT5_ADD_RESOURCES(resources_RCC ${EXEC_NAME}.qrc)
+QT_ADD_RESOURCES(resources_RCC ${EXEC_NAME}.qrc)
 
 add_executable(${EXEC_NAME}
   ${EXEC_NAME}.cc

examples/standalone/window/CMakeLists.txt

@@ -8,8 +8,8 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
-find_package (Qt5 5.15
+# Find Qt6
+find_package (Qt6 6.4
   COMPONENTS
     Core
     Quick

include/gz/gui/qml/Chart.qml

@@ -17,7 +17,7 @@
 import QtQuick 2.9
 import QtCharts 2.2
 import QtQuick.Controls 2.2
-import QtQuick.Controls.Styles 1.4
+
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.3
 
@@ -291,7 +291,7 @@ Rectangle {
 
     DropArea {
       anchors.fill: parent
-      onDropped:
+      onDropped: (drop) =>
       {
         var text = drop.getDataAsString("text/plain");
         infoRect.onDrop(text);
@@ -636,7 +636,7 @@ Rectangle {
       /**
         Zoom
       */
-      onWheel:{
+      onWheel: (wheel) => {
         if (multiChartsMode)
           return
 
@@ -677,7 +677,7 @@ Rectangle {
 
     DropArea {
       anchors.fill: parent
-      onDropped:
+      onDropped: (drop) =>
       {
         var text = drop.getDataAsString("text/plain");
         infoRect.onDrop(text);

include/gz/gui/qml/GzCard.qml

@@ -124,23 +124,23 @@ Pane {
    * Tool bar background color
    */
   property string pluginToolBarColor:
-    typeof MainWindow === "undefined" ||
-    MainWindow.pluginToolBarColorLight === "" ||
-    MainWindow.pluginToolBarColorDark === "" ?
+    typeof _MainWindow === "undefined" ||
+    _MainWindow.pluginToolBarColorLight === "" ||
+    _MainWindow.pluginToolBarColorDark === "" ?
     Material.accent :
     (Material.theme === Material.Light) ?
-    MainWindow.pluginToolBarColorLight : MainWindow.pluginToolBarColorDark
+    _MainWindow.pluginToolBarColorLight : _MainWindow.pluginToolBarColorDark
 
   /**
    * Tool bar text color
    */
   property string pluginToolBarTextColor:
-    typeof MainWindow === "undefined" ||
-    MainWindow.pluginToolBarTextColorLight === "" ||
-    MainWindow.pluginToolBarTextColorDark === "" ?
+    typeof _MainWindow === "undefined" ||
+    _MainWindow.pluginToolBarTextColorLight === "" ||
+    _MainWindow.pluginToolBarTextColorDark === "" ?
     Material.background :
     (Material.theme === Material.Light) ?
-    MainWindow.pluginToolBarTextColorLight : MainWindow.pluginToolBarTextColorDark
+    _MainWindow.pluginToolBarTextColorLight : _MainWindow.pluginToolBarTextColorDark
 
   /**
    * Close signal
@@ -164,7 +164,7 @@ Pane {
   // Stop scroll propagation to widgets below
   MouseArea {
     anchors.fill: parent
-    onWheel: {
+    onWheel: (wheel) => {
       wheel.accepted = true
     }
   }
@@ -253,7 +253,7 @@ Pane {
    */
   function enterDockedState()
   {
-    // It's possible to enter the docking state when not floating 
+    // It's possible to enter the docking state when not floating
     // (e.g. at initialization or when transitioning from docked_collapsed).
     // Do the actual docking only if the card is floating currently.
     if (cardPane.floating)

include/gz/gui/qml/GzCardSettings.qml

@@ -18,7 +18,7 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQuick.Window 2.2
-import QtQuick.Dialogs 1.0
+import QtQuick.Dialogs
 import "qrc:/qml"
 
 Dialog {
@@ -208,7 +208,7 @@ Dialog {
   ColorDialog {
     id: colorDialog
     title: "Please choose a color"
-    showAlphaChannel : true
+    options: ColorDialog.ShowAlphaChannel
     onAccepted: {
       content.color = colorDialog.color
       bgColor.color = colorDialog.color

include/gz/gui/qml/GzColor.qml

@@ -16,9 +16,10 @@
 */
 import QtQuick 2.9
 import QtQuick.Controls 2.1
-import QtQuick.Dialogs 1.0
+import QtQuick.Dialogs
 import QtQuick.Layouts 1.3
 import QtQuick.Controls.Material 2.1
+import Qt.labs.platform
 
 
 // RGBA using range 0 - 1.0
@@ -56,12 +57,12 @@ Item {
     id: gzColorDialog
     title: "Choose a color"
     visible: false
-    showAlphaChannel: true
+    options: ColorDialog.ShowAlphaChannel
     onAccepted: {
-      r = gzColorDialog.color.r
-      g = gzColorDialog.color.g
-      b = gzColorDialog.color.b
-      a = gzColorDialog.color.a
+      gzColorRoot.r = gzColorDialog.color.r
+      gzColorRoot.g = gzColorDialog.color.g
+      gzColorRoot.b = gzColorDialog.color.b
+      gzColorRoot.a = gzColorDialog.color.a
       gzColorRoot.gzColorSet()
       gzColorDialog.close()
     }

include/gz/gui/qml/GzPose.qml

@@ -18,7 +18,6 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.1
 import QtQuick.Layouts 1.3
-import QtQuick.Controls.Styles 1.4
 
 /**
  *  Item displaying 3D pose information.

include/gz/gui/qml/GzSnackBar.qml

@@ -15,11 +15,11 @@
  *
 */
 
-import QtGraphicalEffects 1.0
+import Qt5Compat.GraphicalEffects
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
-import QtQuick.Dialogs 1.0
+import QtQuick.Dialogs
 import QtQuick.Layouts 1.3
 import QtQuick.Window 2.2
 

include/gz/gui/qml/GzSpinBox.qml

@@ -36,6 +36,7 @@ Item {
   }
 
   implicitHeight: spinBox.implicitHeight
+  implicitWidth: 70
 
   readonly property int kMaxInt: Math.pow(2, 31) - 1
 

include/gz/gui/qml/GzSplit.qml

@@ -46,7 +46,7 @@ Item
   Rectangle
   {
     id: startLabel;
-    visible: MainWindow.pluginCount === 0
+    visible: _MainWindow.pluginCount === 0
     anchors.fill: parent
     color: Material.background
     Label {