From 5090499a9f9ea53971897722c054e7232478d59b Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 18 Dec 2025 00:34:17 +0100 Subject: [PATCH 1/5] remove unused local variable --- src/project_manager/ros_utils.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/project_manager/ros_utils.cpp b/src/project_manager/ros_utils.cpp index 1c90b5a7..24e6aa6b 100644 --- a/src/project_manager/ros_utils.cpp +++ b/src/project_manager/ros_utils.cpp @@ -1018,11 +1018,9 @@ 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()); } } From 0fea0f8f94c62b690a8b375c59737b32a86853ee Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 18 Dec 2025 00:44:34 +0100 Subject: [PATCH 2/5] split list of flags into individual flags --- src/project_manager/ros_utils.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/project_manager/ros_utils.cpp b/src/project_manager/ros_utils.cpp index 24e6aa6b..3e8649e8 100644 --- a/src/project_manager/ros_utils.cpp +++ b/src/project_manager/ros_utils.cpp @@ -1021,7 +1021,10 @@ bool ROSUtils::parseCMakeFileAPI(PackageBuildInfo &package) for (const QJsonValue &val : std::as_const(target_flags)) { if (!val["fragment"].isString()) continue; - 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); + } } } From 7c945c3be8f144650811cb41097f5cd8c194adfa Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 18 Dec 2025 19:20:35 +0100 Subject: [PATCH 3/5] replace removed 'settingsChanged' signal with 'addOnChanged' --- src/project_manager/ros_catkin_make_step.cpp | 5 +++-- src/project_manager/ros_catkin_tools_step.cpp | 5 +++-- src/project_manager/ros_colcon_step.cpp | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) 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 #include #include +#include #include #include #include @@ -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 #include #include +#include #include #include #include @@ -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 #include #include +#include #include #include #include @@ -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() From 6be7215f800d5e4c8a61a98634da799c241d0222 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 18 Dec 2025 19:30:53 +0100 Subject: [PATCH 4/5] 18.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}) From 9850386e3c0d0a86a190517c94f1bc883a9a2836 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 18 Dec 2025 19:45:28 +0100 Subject: [PATCH 5/5] remove unused Qt modules --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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']