Merge branch 'main' into jammy_warnings

gazebosim · Aug 28, 2023 · ff7646e · ff7646e
2 parents e22d978 + 7c4c683
commit ff7646e
Show file tree

Hide file tree

Showing 29 changed files with 8 additions and 475 deletions.
diff --git a/examples/plugin/gz_components/GzComponents.qml b/examples/plugin/gz_components/GzComponents.qml
@@ -40,13 +40,4 @@ Column {
     value: 5.8
     width: 300
   }
-
-  // Deprecated spin box
-  IgnSpinBox {
-    minimumValue: -2
-    maximumValue: 19
-    decimals: 0
-    stepSize: 3
-    value: 5
-  }
 }
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -1,2 +1 @@
 add_subdirectory(gz)
-install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
diff --git a/include/gz/gui/gz.hh b/include/gz/gui/gz.hh
@@ -23,7 +23,6 @@
 /// \brief External hook to read the library version.
 /// \return C-string representing the version. Ex.: 0.1.2
 extern "C" GZ_GUI_VISIBLE char *gzVersion();
-extern "C" GZ_GUI_VISIBLE char GZ_DEPRECATED(7) *ignitionVersion();
 
 /// \brief External hook to execute 'gz gui -l' from the command line.
 extern "C" GZ_GUI_VISIBLE void cmdPluginList();

diff --git a/include/gz/gui/qml/qmldir b/include/gz/gui/qml/qmldir
@@ -5,7 +5,3 @@ GzPose 1.0 GzPose.qml
 GzSnackBar 1.0 GzSnackBar.qml
 GzSpinBox 1.0 GzSpinBox.qml
 GzVector3 1.0 GzVector3.qml
-
-# Deprecated components, remove on tock
-IgnSnackBar 1.0 GzSnackBar.qml
-IgnSpinBox 1.0 GzSpinBox.qml
diff --git a/include/gz/gui/qml/qmldir_deprecated b/include/gz/gui/qml/qmldir_deprecated
diff --git a/include/gz/gui/resources.qrc b/include/gz/gui/resources.qrc
@@ -43,13 +43,4 @@
     <file alias="GzVector3.qml">qml/GzVector3.qml</file>
 </qresource>
 
-<!-- Deprecated module - remove on tock -->
-<qresource prefix="gz-gui-qml/ignition/gui">
-    <file alias="qmldir">qml/qmldir_deprecated</file>
-    <file alias="GzColor.qml">qml/GzColor.qml</file>
-    <file alias="GzPose.qml">qml/GzPose.qml</file>
-    <file alias="GzSnackBar.qml">qml/GzSnackBar.qml</file>
-    <file alias="GzSpinBox.qml">qml/GzSpinBox.qml</file>
-    <file alias="GzVector3.qml">qml/GzVector3.qml</file>
-</qresource>
 </RCC>
diff --git a/include/ignition/gui.hh b/include/ignition/gui.hh
diff --git a/include/ignition/gui/Application.hh b/include/ignition/gui/Application.hh
diff --git a/include/ignition/gui/Conversions.hh b/include/ignition/gui/Conversions.hh
diff --git a/include/ignition/gui/Dialog.hh b/include/ignition/gui/Dialog.hh
diff --git a/include/ignition/gui/DragDropModel.hh b/include/ignition/gui/DragDropModel.hh
diff --git a/include/ignition/gui/Enums.hh b/include/ignition/gui/Enums.hh
diff --git a/include/ignition/gui/Export.hh b/include/ignition/gui/Export.hh
diff --git a/include/ignition/gui/GuiEvents.hh b/include/ignition/gui/GuiEvents.hh
diff --git a/include/ignition/gui/Helpers.hh b/include/ignition/gui/Helpers.hh
diff --git a/include/ignition/gui/MainWindow.hh b/include/ignition/gui/MainWindow.hh
diff --git a/include/ignition/gui/PlottingInterface.hh b/include/ignition/gui/PlottingInterface.hh
diff --git a/include/ignition/gui/Plugin.hh b/include/ignition/gui/Plugin.hh
diff --git a/include/ignition/gui/SearchModel.hh b/include/ignition/gui/SearchModel.hh
diff --git a/include/ignition/gui/config.hh b/include/ignition/gui/config.hh
diff --git a/include/ignition/gui/ign.hh b/include/ignition/gui/ign.hh