ProjectExplorer: Change BuildStepConfigWidget::summaryWidget()

From a virtual function to a normal one backed by a real data member.

That's essentially what several re-implementations did, the other
ones used a fixed value instead.

Change-Id: I61e45f1d4f7f0f80fe2eb1f2729785f37e7bb803
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

35 files changed, 34 insertions, 179 deletions

diff --git a/src/plugins/android/androidbuildapkwidget.cpp b/src/plugins/android/androidbuildapkwidget.cpp
index ac94aa487f..b002e9cfb0 100644
--- a/src/plugins/android/androidbuildapkwidget.cpp
+++ b/src/plugins/android/androidbuildapkwidget.cpp
@@ -63,6 +63,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
 {
     m_ui->setupUi(this);
     setDisplayName(tr("<b>Build Android APK</b>"));
+    setSummaryText(displayName());
 
     // Target sdk combobox
     const int minApiSupported = AndroidManager::apiLevelRange().first;
@@ -134,11 +135,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
     delete m_ui;
 }
 
-QString AndroidBuildApkInnerWidget::summaryText() const
-{
-    return displayName();
-}
-
 void AndroidBuildApkInnerWidget::setTargetSdk(const QString &sdk)
 {
     m_step->setBuildTargetSdk(sdk);
@@ -230,6 +226,7 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
     m_step(step)
 {
     setDisplayName(tr("<b>Build Android APK</b>"));
+    setSummaryText(tr("<b>Build Android APK</b>"));
 
     m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
 
@@ -321,10 +318,5 @@ void AndroidBuildApkWidget::checkEnableRemoveButton()
     m_removeAndroidExtraLibButton->setEnabled(m_androidExtraLibsListView->selectionModel()->hasSelection());
 }
 
-QString AndroidBuildApkWidget::summaryText() const
-{
-    return tr("<b>Build Android APK</b>");
-}
-
 } // Internal
 } // Android
diff --git a/src/plugins/android/androidbuildapkwidget.h b/src/plugins/android/androidbuildapkwidget.h
index ba3cdd5524..db935ecc35 100644
--- a/src/plugins/android/androidbuildapkwidget.h
+++ b/src/plugins/android/androidbuildapkwidget.h
@@ -63,7 +63,6 @@ private:
     void updateKeyStorePath(const QString &path);
     void signPackageCheckBoxToggled(bool checked);
 
-    QString summaryText() const override;
     void setCertificates();
 
     Ui::AndroidBuildApkWidget *m_ui;
@@ -85,8 +84,6 @@ private:
     void removeAndroidExtraLib();
     void checkEnableRemoveButton();
 
-    QString summaryText() const final;
-
 private:
     QListView *m_androidExtraLibsListView = nullptr;
     QToolButton *m_removeAndroidExtraLibButton = nullptr;
diff --git a/src/plugins/android/androiddeployqtwidget.cpp b/src/plugins/android/androiddeployqtwidget.cpp
index a61acfcbcd..3b7f86f136 100644
--- a/src/plugins/android/androiddeployqtwidget.cpp
+++ b/src/plugins/android/androiddeployqtwidget.cpp
@@ -42,6 +42,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
 {
     m_ui->setupUi(this);
     setDisplayName(tr("<b>Deploy configurations</b>"));
+    setSummaryText(displayName());
 
     m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
     m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
@@ -61,11 +62,6 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget()
     delete m_ui;
 }
 
-QString AndroidDeployQtWidget::summaryText() const
-{
-    return displayName();
-}
-
 void AndroidDeployQtWidget::installMinistro()
 {
     QString packagePath =
diff --git a/src/plugins/android/androiddeployqtwidget.h b/src/plugins/android/androiddeployqtwidget.h
index 086d58d614..e1f5b19abb 100644
--- a/src/plugins/android/androiddeployqtwidget.h
+++ b/src/plugins/android/androiddeployqtwidget.h
@@ -51,8 +51,6 @@ private:
     void cleanLibsOnDevice();
     void resetDefaultDevices();
 
-    QString summaryText() const override;
-
     Ui::AndroidDeployQtWidget *m_ui;
     AndroidDeployQtStep *m_step;
 };
diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index 5e39dc5b0a..0236a3a839 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -129,11 +129,7 @@ AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(Andro
     : BuildStepConfigWidget(step, false)
 {
     setDisplayName(tr("Make install"));
-}
-
-QString AndroidPackageInstallationStepWidget::summaryText() const
-{
-    return "<b>" + tr("Make install") + "</b>";
+    setSummaryText("<b>" + tr("Make install") + "</b>");
 }
 
 //
diff --git a/src/plugins/android/androidpackageinstallationstep.h b/src/plugins/android/androidpackageinstallationstep.h
index b27e4ad71f..e73d1935b2 100644
--- a/src/plugins/android/androidpackageinstallationstep.h
+++ b/src/plugins/android/androidpackageinstallationstep.h
@@ -58,8 +58,6 @@ class AndroidPackageInstallationStepWidget : public ProjectExplorer::BuildStepCo
     Q_OBJECT
 public:
     AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
-
-    QString summaryText() const override;
 };
 
 class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
index 6635dc242a..4e0dc50a50 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp
@@ -176,11 +176,6 @@ AutogenStepConfigWidget::AutogenStepConfigWidget(AutogenStep *autogenStep) :
             this, &AutogenStepConfigWidget::updateDetails);
 }
 
-QString AutogenStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
-}
-
 void AutogenStepConfigWidget::updateDetails()
 {
     BuildConfiguration *bc = m_autogenStep->buildConfiguration();
@@ -192,6 +187,6 @@ void AutogenStepConfigWidget::updateDetails()
     param.setWorkingDirectory(projectDir);
     param.setCommand("./autogen.sh");
     param.setArguments(m_autogenStep->additionalArguments());
-    m_summaryText = param.summary(displayName());
-    emit updateSummary();
+
+    setSummaryText(param.summary(displayName()));
 }
diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h
index e047c57ab6..2da51829d1 100644
--- a/src/plugins/autotoolsprojectmanager/autogenstep.h
+++ b/src/plugins/autotoolsprojectmanager/autogenstep.h
@@ -111,13 +111,10 @@ class AutogenStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     AutogenStepConfigWidget(AutogenStep *autogenStep);
 
-    QString summaryText() const override;
-
 private:
     void updateDetails();
 
     AutogenStep *m_autogenStep;
-    QString m_summaryText;
     QLineEdit *m_additionalArguments;
 };
 
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
index bdfb32e5a2..a620411690 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
@@ -169,11 +169,6 @@ AutoreconfStepConfigWidget::AutoreconfStepConfigWidget(AutoreconfStep *autorecon
             this, &AutoreconfStepConfigWidget::updateDetails);
 }
 
-QString AutoreconfStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
-}
-
 void AutoreconfStepConfigWidget::updateDetails()
 {
     BuildConfiguration *bc = m_autoreconfStep->buildConfiguration();
@@ -185,6 +180,6 @@ void AutoreconfStepConfigWidget::updateDetails()
     param.setWorkingDirectory(projectDir);
     param.setCommand("autoreconf");
     param.setArguments(m_autoreconfStep->additionalArguments());
-    m_summaryText = param.summary(displayName());
-    emit updateSummary();
+
+    setSummaryText(param.summary(displayName()));
 }
diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
index 435b7d0579..2011660e7a 100644
--- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h
+++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h
@@ -110,13 +110,10 @@ class AutoreconfStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     AutoreconfStepConfigWidget(AutoreconfStep *autoreconfStep);
 
-    QString summaryText() const override;
-
 private:
     void updateDetails();
 
     AutoreconfStep *m_autoreconfStep;
-    QString m_summaryText;
     QLineEdit *m_additionalArguments;
 };
 
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp
index 880547fb24..88966567d4 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp
@@ -194,11 +194,6 @@ ConfigureStepConfigWidget::ConfigureStepConfigWidget(ConfigureStep *configureSte
             this, &ConfigureStepConfigWidget::updateDetails);
 }
 
-QString ConfigureStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
-}
-
 void ConfigureStepConfigWidget::updateDetails()
 {
     BuildConfiguration *bc = m_configureStep->buildConfiguration();
@@ -209,6 +204,6 @@ void ConfigureStepConfigWidget::updateDetails()
     param.setWorkingDirectory(bc->buildDirectory().toString());
     param.setCommand(projectDirRelativeToBuildDir(bc) + "configure");
     param.setArguments(m_configureStep->additionalArguments());
-    m_summaryText = param.summaryInWorkdir(displayName());
-    emit updateSummary();
+
+    setSummaryText(param.summaryInWorkdir(displayName()));
 }
diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h
index b87e5d7b94..fb31ce525e 100644
--- a/src/plugins/autotoolsprojectmanager/configurestep.h
+++ b/src/plugins/autotoolsprojectmanager/configurestep.h
@@ -111,13 +111,10 @@ class ConfigureStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     ConfigureStepConfigWidget(ConfigureStep *configureStep);
 
-    QString summaryText() const override;
-
 private:
     void updateDetails();
 
     ConfigureStep *m_configureStep;
-    QString m_summaryText;
     QLineEdit *m_additionalArguments;
 };
 
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 0700461108..35c3bee51a 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -525,8 +525,7 @@ void CMakeBuildStepConfigWidget::updateDetails()
 {
     BuildConfiguration *bc = m_buildStep->buildConfiguration();
     if (!bc) {
-        m_summaryText = tr("<b>No build configuration found on this kit.</b>");
-        emit updateSummary();
+        setSummaryText(tr("<b>No build configuration found on this kit.</b>"));
         return;
     }
 
@@ -536,14 +535,8 @@ void CMakeBuildStepConfigWidget::updateDetails()
     param.setWorkingDirectory(bc->buildDirectory().toString());
     param.setCommand(m_buildStep->cmakeCommand());
     param.setArguments(m_buildStep->allArguments(0));
-    m_summaryText = param.summary(displayName());
 
-    emit updateSummary();
-}
-
-QString CMakeBuildStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
+    setSummaryText(param.summary(displayName()));
 }
 
 //
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index 17806f48f3..0b8eeba841 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -120,7 +120,6 @@ class CMakeBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
     Q_OBJECT
 public:
     CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
-    QString summaryText() const override;
 
 private:
     void itemChanged(QListWidgetItem*);
@@ -132,7 +131,6 @@ private:
     CMakeBuildStep *m_buildStep;
     QLineEdit *m_toolArguments;
     QListWidget *m_buildTargetsList;
-    QString m_summaryText;
 };
 
 class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index 4a08afe5cf..5bb6280638 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -259,13 +259,8 @@ void IosBuildStepConfigWidget::updateDetails()
     param.setEnvironment(bc->environment());
     param.setCommand(m_buildStep->buildCommand());
     param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->allArguments()));
-    m_summaryText = param.summary(displayName());
-    emit updateSummary();
-}
 
-QString IosBuildStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
+    setSummaryText(param.summary(displayName()));
 }
 
 void IosBuildStepConfigWidget::buildArgumentsChanged()
diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index e32b5b60c7..35f3f5035c 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -77,7 +77,6 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     IosBuildStepConfigWidget(IosBuildStep *buildStep);
     ~IosBuildStepConfigWidget();
-    QString summaryText() const override;
 
 private:
     void buildArgumentsChanged();
@@ -87,7 +86,6 @@ private:
 
     Ui::IosBuildStep *m_ui;
     IosBuildStep *m_buildStep;
-    QString m_summaryText;
 };
 
 class IosBuildStepFactory : public ProjectExplorer::BuildStepFactory
diff --git a/src/plugins/ios/iosdeploystepwidget.cpp b/src/plugins/ios/iosdeploystepwidget.cpp
index f1bf2dc1b9..d24b2d38b7 100644
--- a/src/plugins/ios/iosdeploystepwidget.cpp
+++ b/src/plugins/ios/iosdeploystepwidget.cpp
@@ -40,6 +40,7 @@ IosDeployStepWidget::IosDeployStepWidget(IosDeployStep *step) :
     m_step(step)
 {
     setDisplayName(QString::fromLatin1("<b>%1</b>").arg(m_step->displayName()));
+    setSummaryText(displayName());
     ui->setupUi(this);
     connect(m_step, &ProjectExplorer::ProjectConfiguration::displayNameChanged,
             this, &ProjectExplorer::BuildStepConfigWidget::updateSummary);
@@ -50,10 +51,5 @@ IosDeployStepWidget::~IosDeployStepWidget()
     delete ui;
 }
 
-QString IosDeployStepWidget::summaryText() const
-{
-    return displayName();
-}
-
 } // namespace Internal
 } // namespace Ios
diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h
index 54c03f3382..6ab40cc8dc 100644
--- a/src/plugins/ios/iosdeploystepwidget.h
+++ b/src/plugins/ios/iosdeploystepwidget.h
@@ -43,8 +43,6 @@ public:
     ~IosDeployStepWidget();
 
 private:
-    QString summaryText() const override;
-
     Ui::IosDeployStepWidget *ui;
     IosDeployStep *m_step;
 };
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index bde3fbae1c..c530b27ed5 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -277,13 +277,8 @@ void IosDsymBuildStepConfigWidget::updateDetails()
     param.setEnvironment(bc->environment());
     param.setCommand(m_buildStep->command());
     param.setArguments(Utils::QtcProcess::joinArgs(m_buildStep->arguments()));
-    m_summaryText = param.summary(displayName());
-    emit updateSummary();
-}
 
-QString IosDsymBuildStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
+    setSummaryText(param.summary(displayName()));
 }
 
 void IosDsymBuildStepConfigWidget::commandChanged()
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index d08ef6404d..f75f1c863e 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -74,7 +74,6 @@ class IosDsymBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidg
 public:
     IosDsymBuildStepConfigWidget(IosDsymBuildStep *buildStep);
     ~IosDsymBuildStepConfigWidget();
-    QString summaryText() const override;
 
 private:
     void commandChanged();
@@ -84,7 +83,6 @@ private:
 
     Ui::IosPresetBuildStep *m_ui;
     IosDsymBuildStep *m_buildStep;
-    QString m_summaryText;
 };
 
 class IosDsymBuildStepFactory : public ProjectExplorer::BuildStepFactory
diff --git a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
index ccad62c503..cb49e4c605 100644
--- a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.cpp
@@ -46,6 +46,7 @@ NimCompilerBuildStepConfigWidget::NimCompilerBuildStepConfigWidget(NimCompilerBu
     m_ui->setupUi(this);
 
     setDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_DISPLAY));
+    setSummaryText(tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_SUMMARY));
 
     // Connect the project signals
     auto project = static_cast<NimProject *>(m_buildStep->project());
@@ -69,11 +70,6 @@ NimCompilerBuildStepConfigWidget::NimCompilerBuildStepConfigWidget(NimCompilerBu
 
 NimCompilerBuildStepConfigWidget::~NimCompilerBuildStepConfigWidget() = default;
 
-QString NimCompilerBuildStepConfigWidget::summaryText() const
-{
-    return tr(Constants::C_NIMCOMPILERBUILDSTEPWIDGET_SUMMARY);
-}
-
 void NimCompilerBuildStepConfigWidget::onTargetChanged(int index)
 {
     Q_UNUSED(index);
diff --git a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h
index 4fbb3fcd64..4c7d1e8d8b 100644
--- a/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h
+++ b/src/plugins/nim/project/nimcompilerbuildstepconfigwidget.h
@@ -41,8 +41,6 @@ public:
     NimCompilerBuildStepConfigWidget(NimCompilerBuildStep *buildStep);
     ~NimCompilerBuildStepConfigWidget();
 
-    QString summaryText() const override;
-
 private:
     void updateUi();
     void updateCommandLineText();
diff --git a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp
index f1b3049f07..0b82052202 100644
--- a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.cpp
@@ -41,6 +41,7 @@ NimCompilerCleanStepConfigWidget::NimCompilerCleanStepConfigWidget(NimCompilerCl
 {
     m_ui->setupUi(this);
     setDisplayName(tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_DISPLAY));
+    setSummaryText(tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_SUMMARY));
     connect(cleanStep->buildConfiguration(), &BuildConfiguration::buildDirectoryChanged,
             this, &NimCompilerCleanStepConfigWidget::updateUi);
     updateUi();
@@ -48,11 +49,6 @@ NimCompilerCleanStepConfigWidget::NimCompilerCleanStepConfigWidget(NimCompilerCl
 
 NimCompilerCleanStepConfigWidget::~NimCompilerCleanStepConfigWidget() = default;
 
-QString NimCompilerCleanStepConfigWidget::summaryText() const
-{
-    return tr(Constants::C_NIMCOMPILERCLEANSTEPWIDGET_SUMMARY);
-}
-
 void NimCompilerCleanStepConfigWidget::updateUi()
 {
     auto buildDiretory = step()->buildConfiguration()->buildDirectory();
diff --git a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h
index 462289b6c2..3de9964856 100644
--- a/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h
+++ b/src/plugins/nim/project/nimcompilercleanstepconfigwidget.h
@@ -42,8 +42,6 @@ public:
 
     ~NimCompilerCleanStepConfigWidget();
 
-    QString summaryText() const override;
-
 private:
     void updateUi();
 
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 1be569cd41..99c26b540c 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -369,18 +369,19 @@ BuildStepConfigWidget::BuildStepConfigWidget(BuildStep *step, bool showWidget)
     : m_step(step), m_showWidget(showWidget)
 {
     m_displayName = step->displayName();
+    m_summaryText = "<b>" + m_displayName + "</b>";
     connect(m_step, &ProjectConfiguration::displayNameChanged,
             this, &BuildStepConfigWidget::updateSummary);
 }
 
 QString BuildStepConfigWidget::summaryText() const
 {
-    return "<b>" + displayName() + "</b>";
+    return m_summaryText;
 }
 
 QString BuildStepConfigWidget::displayName() const
 {
-    return m_step->displayName();
+    return m_displayName;
 }
 
 void BuildStepConfigWidget::setDisplayName(const QString &displayName)
@@ -388,4 +389,12 @@ void BuildStepConfigWidget::setDisplayName(const QString &displayName)
     m_displayName = displayName;
 }
 
+void BuildStepConfigWidget::setSummaryText(const QString &summaryText)
+{
+    if (summaryText != m_summaryText) {
+        m_summaryText = summaryText;
+        updateSummary();
+    }
+}
+
 } // ProjectExplorer
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index 2679515e04..6e82656566 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -173,13 +173,13 @@ class PROJECTEXPLORER_EXPORT BuildStepConfigWidget : public QWidget
 public:
     BuildStepConfigWidget(BuildStep *step, bool showWidget = true);
 
-    virtual QString summaryText() const;
-
+    QString summaryText() const;
     QString displayName() const;
     BuildStep *step() const { return m_step; }
     bool showWidget() const { return m_showWidget; }
 
     void setDisplayName(const QString &displayName);
+    void setSummaryText(const QString &summaryText);
 
 signals:
     void updateSummary();
@@ -188,6 +188,7 @@ private:
     BuildStep *m_step = nullptr;
     const bool m_showWidget = true;
     QString m_displayName;
+    QString m_summaryText;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index 90cd430aa8..ae826580c6 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -406,14 +406,6 @@ MakeStepConfigWidget::~MakeStepConfigWidget()
     delete m_ui;
 }
 
-void MakeStepConfigWidget::setSummaryText(const QString &text)
-{
-    if (text == m_summaryText)
-        return;
-    m_summaryText = text;
-    emit updateSummary();
-}
-
 void MakeStepConfigWidget::setUserJobCountVisible(bool visible)
 {
     m_ui->jobsLabel->setVisible(visible);
@@ -461,11 +453,6 @@ void MakeStepConfigWidget::updateDetails()
         setSummaryText(param.summaryInWorkdir(displayName()));
 }
 
-QString MakeStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
-}
-
 void MakeStepConfigWidget::itemChanged(QListWidgetItem *item)
 {
     m_makeStep->setBuildTarget(item->text(), item->checkState() & Qt::Checked);
diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h
index 678299a521..35d51f0a9f 100644
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -100,19 +100,15 @@ public:
     explicit MakeStepConfigWidget(MakeStep *makeStep);
     ~MakeStepConfigWidget() override;
 
-    QString summaryText() const override;
-
 private:
     void itemChanged(QListWidgetItem *item);
     void makeLineEditTextEdited();
     void makeArgumentsLineEditTextEdited();
     void updateDetails();
-    void setSummaryText(const QString &text);
     void setUserJobCountVisible(bool visible);
 
     Internal::Ui::MakeStep *m_ui;
     MakeStep *m_makeStep;
-    QString m_summaryText;
 };
 
 } // namespace GenericProjectManager
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 2540af57c3..7006d1b557 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -68,7 +68,6 @@ class QbsBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     QbsBuildStepConfigWidget(QbsBuildStep *step);
     ~QbsBuildStepConfigWidget() override;
-    QString summaryText() const override;
 
 private:
     void updateState();
@@ -115,7 +114,6 @@ private:
     };
 
     QList<Property> m_propertyCache;
-    QString m_summary;
     bool m_ignoreChange;
 };
 
@@ -596,11 +594,6 @@ QbsBuildStepConfigWidget::~QbsBuildStepConfigWidget()
     delete m_ui;
 }
 
-QString QbsBuildStepConfigWidget::summaryText() const
-{
-    return m_summary;
-}
-
 void QbsBuildStepConfigWidget::updateState()
 {
     if (!m_ignoreChange) {
@@ -632,11 +625,7 @@ void QbsBuildStepConfigWidget::updateState()
         command.append(' ').append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true");
     m_ui->commandLineTextEdit->setPlainText(command);
 
-    QString summary = tr("<b>Qbs:</b> %1").arg(command);
-    if (m_summary != summary) {
-        m_summary = summary;
-        emit updateSummary();
-    }
+    setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
 }
 
 void QbsBuildStepConfigWidget::updateQmlDebuggingOption()
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index 3a4d8d20af..e831891cba 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -245,11 +245,6 @@ QbsCleanStepConfigWidget::~QbsCleanStepConfigWidget()
     delete m_ui;
 }
 
-QString QbsCleanStepConfigWidget::summaryText() const
-{
-    return m_summary;
-}
-
 void QbsCleanStepConfigWidget::updateState()
 {
     m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
@@ -259,11 +254,7 @@ void QbsCleanStepConfigWidget::updateState()
             ->equivalentCommandLine(m_step);
     m_ui->commandLineTextEdit->setPlainText(command);
 
-    QString summary = tr("<b>Qbs:</b> %1").arg(command);
-    if (m_summary !=  summary) {
-        m_summary = summary;
-        emit updateSummary();
-    }
+    setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
 }
 
 void QbsCleanStepConfigWidget::changeDryRun(bool dr)
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h
index 7f5f7e86f9..f7061629f3 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.h
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.h
@@ -96,7 +96,6 @@ class QbsCleanStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     QbsCleanStepConfigWidget(QbsCleanStep *step);
     ~QbsCleanStepConfigWidget() override;
-    QString summaryText() const override;
 
 private:
     void updateState();
@@ -108,7 +107,6 @@ private:
     Ui::QbsCleanStepConfigWidget *m_ui;
 
     QbsCleanStep *m_step;
-    QString m_summary;
 };
 
 class QbsCleanStepFactory : public ProjectExplorer::BuildStepFactory
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
index aa62ab2b00..f961fd1af1 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
@@ -283,11 +283,6 @@ QbsInstallStepConfigWidget::~QbsInstallStepConfigWidget()
     delete m_ui;
 }
 
-QString QbsInstallStepConfigWidget::summaryText() const
-{
-    return m_summary;
-}
-
 void QbsInstallStepConfigWidget::updateState()
 {
     if (!m_ignoreChange) {
@@ -301,11 +296,7 @@ void QbsInstallStepConfigWidget::updateState()
 
     m_ui->commandLineTextEdit->setPlainText(command);
 
-    QString summary = tr("<b>Qbs:</b> %1").arg(command);
-    if (m_summary != summary) {
-        m_summary = summary;
-        emit updateSummary();
-    }
+    setSummaryText(tr("<b>Qbs:</b> %1").arg(command));
 }
 
 void QbsInstallStepConfigWidget::changeRemoveFirst(bool rf)
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h
index 0679895733..a3fac56c0b 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.h
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h
@@ -99,7 +99,6 @@ class QbsInstallStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     QbsInstallStepConfigWidget(QbsInstallStep *step);
     ~QbsInstallStepConfigWidget() override;
-    QString summaryText() const override;
 
 private:
     void updateState();
@@ -112,7 +111,6 @@ private:
     Ui::QbsInstallStepConfigWidget *m_ui;
 
     QbsInstallStep *m_step;
-    QString m_summary;
     bool m_ignoreChange;
 };
 
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 9bab510f48..05afba8ad8 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -616,11 +616,6 @@ QMakeStepConfigWidget::~QMakeStepConfigWidget()
     delete m_ui;
 }
 
-QString QMakeStepConfigWidget::summaryText() const
-{
-    return m_summaryText;
-}
-
 void QMakeStepConfigWidget::qtVersionChanged()
 {
     updateSummaryLabel();
@@ -833,14 +828,6 @@ void QMakeStepConfigWidget::recompileMessageBoxFinished(int button)
     }
 }
 
-void QMakeStepConfigWidget::setSummaryText(const QString &text)
-{
-    if (text == m_summaryText)
-        return;
-    m_summaryText = text;
-    emit updateSummary();
-}
-
 ////
 // QMakeStepFactory
 ////
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index 136ad9e464..66c504641c 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -198,7 +198,6 @@ class QMakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
 public:
     QMakeStepConfigWidget(QMakeStep *step);
     ~QMakeStepConfigWidget() override;
-    QString summaryText() const override;
 
 private:
     // slots for handling buildconfiguration/step signals
@@ -224,11 +223,8 @@ private:
     void updateQtQuickCompilerOption();
     void updateEffectiveQMakeCall();
 
-    void setSummaryText(const QString &);
-
     Internal::Ui::QMakeStep *m_ui = nullptr;
     QMakeStep *m_step = nullptr;
-    QString m_summaryText;
     bool m_ignoreChange = false;
 };