Forward-port updates (#1633)

Signed-off-by: Louise Poubel <[email protected]>

Migration.md

@@ -116,7 +116,7 @@ since pose information is being logged in the `changed_state` topic.
       + `ViewAndle`: Move camera to preset angles
 
 * The `gui.config` and `server.config` files are now located in a versioned
-  folder inside `$HOME/.ignition/gazebo`, i.e. `$HOME/.ignition/gazebo/6/gui.config`.
+  folder inside `$HOME/.gz/sim`, i.e. `$HOME/.gz/sim/6/gui.config`.
 
 * The `Component::Clone` method has been marked `const` to reflect that it
   should not mutate internal component state. Component implementations that

examples/plugin/custom_sensor_system/CMakeLists.txt

@@ -20,7 +20,7 @@ include(FetchContent)
 FetchContent_Declare(
   sensors_clone
   GIT_REPOSITORY https://github.com/gazebosim/gz-sensors
-  GIT_TAG main
+  GIT_TAG gz-sensors7
 )
 FetchContent_Populate(sensors_clone)
 add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_clone_BINARY_DIR})

src/gui/Gui.cc

@@ -127,7 +127,7 @@ std::string launchQuickStart(int &_argc, char **_argv,
     _argc, _argv, gz::gui::WindowType::kDialog);
   app->SetDefaultConfigPath(_defaultConfig);
 
-  auto quickStartHandler = new gui::QuickStartHandler();
+  auto quickStartHandler = new QuickStartHandler();
   quickStartHandler->setParent(app->Engine());
 
   auto dialog = new gz::gui::Dialog();

src/gui/QuickStartHandler.hh

@@ -20,8 +20,8 @@
 #include <QtCore>
 #include <string>
 
-#include "gz/sim/Export.hh"
 #include "gz/sim/config.hh"
+#include "gz/sim/gui/Export.hh"
 
 namespace gz
 {
@@ -32,7 +32,7 @@ inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace gui
 {
 /// \brief Class for handling quick start dialog
-class QuickStartHandler : public QObject
+class GZ_SIM_GUI_VISIBLE QuickStartHandler : public QObject
 {
   Q_OBJECT