diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28f4edfb..7a7a0aeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(QTC_COMPAT_MAJOR ${CMAKE_MATCH_1})
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" QTC_VER_DISPLAY ${IDE_VERSION_DISPLAY})
 set(QTC_DISPLAY_MAJOR ${CMAKE_MATCH_1})
 
-set(PLUGIN_MINOR 1)
+set(PLUGIN_MINOR 2)
 
 project(ROSProjectManager VERSION ${QTC_DISPLAY_MAJOR}.${PLUGIN_MINOR})
 
diff --git a/src/project_manager/ros_catkin_make_step.cpp b/src/project_manager/ros_catkin_make_step.cpp
index cf38674c..714928b4 100644
--- a/src/project_manager/ros_catkin_make_step.cpp
+++ b/src/project_manager/ros_catkin_make_step.cpp
@@ -30,6 +30,7 @@
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtparser.h>
 #include <utils/stringutils.h>
@@ -262,8 +263,8 @@ ROSCatkinMakeStepWidget::ROSCatkinMakeStepWidget(ROSCatkinMakeStep *makeStep)
     connect(bc, &ROSBuildConfiguration::environmentChanged,
             this, &ROSCatkinMakeStepWidget::updateDetails);
 
-    connect(ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
-            this, SLOT(updateDetails()));
+    m_makeStep->project()->projectExplorerSettings().addOnChanged(
+        this, std::bind(&ROSCatkinMakeStepWidget::updateDetails, this));
 }
 
 ROSCatkinMakeStepWidget::~ROSCatkinMakeStepWidget()
diff --git a/src/project_manager/ros_catkin_tools_step.cpp b/src/project_manager/ros_catkin_tools_step.cpp
index 302708ef..5ac4b504 100644
--- a/src/project_manager/ros_catkin_tools_step.cpp
+++ b/src/project_manager/ros_catkin_tools_step.cpp
@@ -32,6 +32,7 @@
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtparser.h>
 #include <utils/stringutils.h>
@@ -339,8 +340,8 @@ ROSCatkinToolsStepWidget::ROSCatkinToolsStepWidget(ROSCatkinToolsStep *makeStep)
     connect(bc, &ROSBuildConfiguration::environmentChanged,
             this, &ROSCatkinToolsStepWidget::updateDetails);
 
-    connect(ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
-            this, SLOT(updateDetails()));
+    m_makeStep->project()->projectExplorerSettings().addOnChanged(
+        this, std::bind(&ROSCatkinToolsStepWidget::updateDetails, this));
 
     Utils::VariableChooser::addSupportForChildWidgets(this, { makeStep, makeStep->rosBuildConfiguration()->macroExpander() });
 }
diff --git a/src/project_manager/ros_colcon_step.cpp b/src/project_manager/ros_colcon_step.cpp
index 9d2246e3..7f884cf9 100644
--- a/src/project_manager/ros_colcon_step.cpp
+++ b/src/project_manager/ros_colcon_step.cpp
@@ -30,6 +30,7 @@
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorersettings.h>
 #include <projectexplorer/toolchain.h>
 #include <qtsupport/qtparser.h>
 #include <utils/stringutils.h>
@@ -264,8 +265,8 @@ ROSColconStepWidget::ROSColconStepWidget(ROSColconStep *makeStep)
     connect(bc, &ROSBuildConfiguration::environmentChanged,
             this, &ROSColconStepWidget::updateDetails);
 
-    connect(ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
-            this, SLOT(updateDetails()));
+    m_makeStep->project()->projectExplorerSettings().addOnChanged(
+        this, std::bind(&ROSColconStepWidget::updateDetails, this));
 }
 
 ROSColconStepWidget::~ROSColconStepWidget()
diff --git a/src/project_manager/ros_utils.cpp b/src/project_manager/ros_utils.cpp
index 1c90b5a7..3e8649e8 100644
--- a/src/project_manager/ros_utils.cpp
+++ b/src/project_manager/ros_utils.cpp
@@ -1018,12 +1018,13 @@ bool ROSUtils::parseCMakeFileAPI(PackageBuildInfo &package)
                 continue;
 
             const QJsonArray &target_flags = cg["compileCommandFragments"].toArray();
-            QStringList flags;
             for (const QJsonValue &val : std::as_const(target_flags)) {
                 if (!val["fragment"].isString())
                     continue;
-                flags.append(val["fragment"].toString());
-                targetInfo->flags.append(val["fragment"].toString());
+                const QStringList flags = val["fragment"].toString().split(' ');
+                for (const QString &flag : std::as_const(flags)) {
+                    targetInfo->flags.append(flag);
+                }
             }
         }
 
diff --git a/versions.yaml b/versions.yaml
index 2390cd99..17c51dd9 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -16,4 +16,4 @@ qtc_modules: ["qtcreator", "qtcreator_dev"]
 # qtc_dev_tag:
 
 qt_version: "6.10"
-qt_modules: ['qtbase', 'qtdeclarative', 'icu', 'qttools', 'qt5compat']
+qt_modules: ['qtbase', 'qtdeclarative', 'icu']