Qt6 WIP

CMakeLists.txt

@@ -81,8 +81,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
@@ -94,7 +94,16 @@ 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()
+
+qt_standard_project_setup()
 
 set(GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR
   ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins

examples/config/scene3d.config

@@ -72,46 +72,3 @@
     <property key="showTitleBar" type="bool">false</property>
   </gz-gui>
 </plugin>
-<plugin filename="WorldControl">
-  <gz-gui>
-    <title>Controls</title>
-    <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>
-    <anchors target="View 1">
-      <line own="left" target="left"/>
-      <line own="bottom" target="bottom"/>
-    </anchors>
-  </gz-gui>
-  <play_pause>true</play_pause>
-  <step>true</step>
-  <start_paused>false</start_paused>
-  <service>/world_control</service>
-  <stats_topic>/world_stats</stats_topic>
-</plugin>
-
-<plugin filename="WorldStats">
-  <gz-gui>
-    <title>Stats</title>
-    <property type="bool" key="showTitleBar">false</property>
-    <property type="bool" key="resizable">false</property>
-    <property type="double" key="height">110</property>
-    <property type="double" key="width">290</property>
-    <property type="double" key="z">1</property>
-
-    <property type="string" key="state">floating</property>
-    <anchors target="View 1">
-      <line own="right" target="right"/>
-      <line own="bottom" target="bottom"/>
-    </anchors>
-  </gz-gui>
-  <sim_time>true</sim_time>
-  <real_time>true</real_time>
-  <real_time_factor>true</real_time_factor>
-  <iterations>true</iterations>
-  <topic>/world_stats</topic>
-</plugin>

examples/plugin/custom_context_menu/CustomContext.qml

@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 
 Rectangle {
   id: customContext

examples/plugin/dialog_from_plugin/DialogFromPlugin.qml

@@ -14,10 +14,10 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Dialogs 1.0
-import QtQuick.Window 2.2
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Dialogs
+import QtQuick.Window
 
 Rectangle {
   id: customPlugin

examples/plugin/gz_components/GzComponents.qml

@@ -14,9 +14,9 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.0
-import gz.gui 1.0
+import QtQuick
+import QtQuick.Controls
+import gz.gui
 
 Column {
   anchors.fill: parent

examples/plugin/hello_plugin/HelloPlugin.qml

@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 Rectangle {
   color: "transparent"
   anchors.fill: parent

examples/plugin/multiple_qml/MultipleQml.qml

@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 import "qrc:/MultipleQml_qml"
 
 Column {

examples/standalone/custom_drawer/CustomDrawer.qml

@@ -14,9 +14,9 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-import QtQuick.Controls.Material 2.1
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Material
 
 /**
  * Custom drawer

examples/standalone/start_dialog/start_dialog.qml

@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 Rectangle {
   color: "green"
   anchors.fill: parent

include/gz/gui/CMakeLists.txt

@@ -1,9 +1,3 @@
-if(POLICY CMP0100)
-  cmake_policy(SET CMP0100 NEW)
-endif()
-
-set (CMAKE_AUTOMOC ON)
-
 set (qt_headers
   Application.hh
   Dialog.hh
@@ -20,19 +14,101 @@ set (headers
   gz.hh
   qt.h
   SearchModel.hh
-  System.hh
 )
 
-set (resources resources.qrc)
-
-qt_wrap_cpp(headers_MOC ${qt_headers})
-qt_add_resources(resources_RCC ${resources})
+set(qml_files
+  qml/Chart.qml
+  qml/GzCard.qml
+  qml/GzCardSettings.qml
+  qml/GzColor.qml
+  qml/GzHelpers.qml
+  qml/GzPlotIcon.qml
+  qml/GzPose.qml
+  qml/GzRulers.qml
+  qml/GzSnackBar.qml
+  qml/GzSortFilterModel.qml
+  qml/GzSpinBox.qml
+  qml/GzSplit.qml
+  qml/GzVector3.qml
+  qml/Main.qml
+  qml/PlottingInterface.qml
+  qml/PluginMenu.qml
+  qml/SideDrawer.qml
+  qml/StandaloneDialog.qml
+  qml/StyleDialog.qml
+)
 
-gz_create_core_library(SOURCES
-  ${sources}
-  ${headers_MOC}
-  ${resources_RCC}
+set(resources
+  qml/images/drawer.png
+  qml/images/export_icon.png
+  qml/images/gazebo_logo.png
+  qml/images/menu.png
+  qml/images/plottable_icon.svg
+  qml/images/search.svg
 )
+
+if (QT_MAJOR_VERSION EQUAL 6)
+  qt_add_qml_module(${PROJECT_LIBRARY_TARGET_NAME}
+    URI gz.gui
+    VERSION 9.0.0
+    SOURCES ${sources} ${qt_headers} ${headers}
+    QML_FILES ${qml_files}
+    RESOURCES ${resources}
+  )
+
+  include(GenerateExportHeader)
+  generate_export_header(${PROJECT_LIBRARY_TARGET_NAME}
+    BASE_NAME GZ_GUI
+    EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/gz/gui/detail/Export.hh
+    EXPORT_MACRO_NAME DETAIL_GZ_GUI_VISIBLE
+    NO_EXPORT_MACRO_NAME DETAIL_GZ_GUI_HIDDEN
+    DEPRECATED_MACRO_NAME GZ_DEPRECATED_ALL_VERSIONS)
+
+  set(include_dir "gz/gui")
+  set(export_base "GZ_GUI")
+  configure_file(
+    "${GZ_CMAKE_DIR}/Export.hh.in"
+    "${PROJECT_BINARY_DIR}/include/gz/gui/Export.hh")
+
+  install(
+    FILES "${PROJECT_BINARY_DIR}/include/gz/gui/Export.hh"
+    DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}/gz/gui/
+    COMPONENT headers)
+
+  install(
+    FILES "${PROJECT_BINARY_DIR}/include/gz/gui/detail/Export.hh"
+    DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}/gz/gui/detail/
+    COMPONENT headers)
+
+  target_include_directories(${PROJECT_LIBRARY_TARGET_NAME}
+    PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+    $<INSTALL_INTERFACE:include/gz/gui9>
+  )
+
+  install(
+    TARGETS ${PROJECT_LIBRARY_TARGET_NAME}
+    EXPORT ${PROJECT_LIBRARY_TARGET_NAME}
+    LIBRARY DESTINATION ${GZ_LIB_INSTALL_DIR}
+    ARCHIVE DESTINATION ${GZ_LIB_INSTALL_DIR}
+    RUNTIME DESTINATION ${GZ_BIN_INSTALL_DIR}
+    COMPONENT libraries)
+
+  _gz_create_cmake_package()
+  _gz_create_pkgconfig()
+
+else()
+  set (resources resources.qrc)
+  qt_wrap_cpp(headers_MOC ${qt_headers})
+  qt_add_resources(resources_RCC ${resources})
+
+  gz_create_core_library(SOURCES
+    ${sources}
+    ${headers_MOC}
+    ${resources_RCC}
+  )
+endif()
+
 gz_add_get_install_prefix_impl(GET_INSTALL_PREFIX_FUNCTION gz::gui::getInstallPrefix
                                GET_INSTALL_PREFIX_HEADER gz/gui/InstallationDirectories.hh
                                OVERRIDE_INSTALL_PREFIX_ENV_VARIABLE GZ_GUI_INSTALL_PREFIX)

include/gz/gui/Plugin.hh

@@ -49,7 +49,7 @@ namespace gz::gui
       Q_OBJECT
 
       /// \brief Constructor
-      public: Plugin();
+      public: Plugin(QObject *_parent=nullptr);
 
       /// \brief Destructor
       public: virtual ~Plugin();

include/gz/gui/qml/Chart.qml

@@ -14,12 +14,11 @@
  * limitations under the License.
  *
 */
-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
+import QtQuick
+import QtCharts
+import QtQuick.Controls
+import QtQuick.Controls.Style
+import QtQuick.Layouts
 
 Rectangle {
   id: main