diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 1f557300488..50288ee2ff6 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -390,12 +390,11 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
         updateConfigurationStateSelection();
     });
 
-    connect(buildSystem, &CMakeBuildSystem::configurationCleared, this, [this]() {
+    connect(buildSystem, &CMakeBuildSystem::configurationCleared, this, [this] {
         updateConfigurationStateSelection();
     });
 
-    connect(m_buildConfiguration, &CMakeBuildConfiguration::errorOccurred,
-            this, [this]() {
+    connect(buildSystem, &CMakeBuildSystem::errorOccurred, this, [this] {
         m_showProgressTimer.stop();
         m_progressIndicator->hide();
         updateConfigurationStateSelection();
@@ -472,11 +471,13 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     connect(m_batchEditButton, &QAbstractButton::clicked,
             this, &CMakeBuildSettingsWidget::batchEditConfiguration);
 
-    connect(bc, &CMakeBuildConfiguration::errorOccurred, this, &CMakeBuildSettingsWidget::setError);
-    connect(bc, &CMakeBuildConfiguration::warningOccurred, this, &CMakeBuildSettingsWidget::setWarning);
-    connect(bc, &CMakeBuildConfiguration::configurationChanged, this, [this](const CMakeConfig &config) {
-       m_configModel->setBatchEditConfiguration(config);
-    });
+    connect(buildSystem, &CMakeBuildSystem::errorOccurred,
+            this, &CMakeBuildSettingsWidget::setError);
+    connect(buildSystem, &CMakeBuildSystem::warningOccurred,
+            this, &CMakeBuildSettingsWidget::setWarning);
+
+    connect(buildSystem, &CMakeBuildSystem::configurationChanged,
+            m_configModel, &ConfigModel::setBatchEditConfiguration);
 
     updateFromKit();
     connect(m_buildConfiguration->target(), &Target::kitChanged,
@@ -1491,7 +1492,7 @@ void CMakeBuildSystem::setError(const QString &message)
         emit buildConfiguration()->enabledChanged();
     }
     TaskHub::addTask(BuildSystemTask(Task::TaskType::Error, message));
-    emit cmakeBuildConfiguration()->errorOccurred(m_error);
+    emit errorOccurred(m_error);
 }
 
 void CMakeBuildSystem::setWarning(const QString &message)
@@ -1500,7 +1501,7 @@ void CMakeBuildSystem::setWarning(const QString &message)
         return;
     m_warning = message;
     TaskHub::addTask(BuildSystemTask(Task::TaskType::Warning, message));
-    emit cmakeBuildConfiguration()->warningOccurred(m_warning);
+    emit warningOccurred(m_warning);
 }
 
 QString CMakeBuildSystem::error() const
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 613320e23f5..e1592de2055 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -81,10 +81,7 @@ public:
     void filterConfigArgumentsFromAdditionalCMakeArguments();
 
 signals:
-    void errorOccurred(const QString &message);
-    void warningOccurred(const QString &message);
     void signingFlagsChanged();
-    void configurationChanged(const CMakeConfig &config);
 
 protected:
     bool fromMap(const QVariantMap &map) override;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index d8716703cf0..502f53f9c30 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -1323,7 +1323,7 @@ void CMakeBuildSystem::updateInitialCMakeExpandableVars()
     }
 
     if (!config.isEmpty())
-        emit cmakeBuildConfiguration()->configurationChanged(config);
+        emit configurationChanged(config);
 }
 
 } // namespace Internal
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
index 5a4ea2ffb48..2972259ff2d 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.h
@@ -113,6 +113,9 @@ public:
 
 signals:
     void configurationCleared();
+    void configurationChanged(const CMakeConfig &config);
+    void errorOccurred(const QString &message);
+    void warningOccurred(const QString &message);
 
 private:
     enum ForceEnabledChanged { False, True };