ProjectExplorer: Make BuildStepConfigWidget::displayName a value

Use BuildStep::displayName() as default.

This probably could be the only possibility, but currently there
are some discrepancies that are kept in this patch to make
the patch mechanical.

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

src/plugins/android/androidbuildapkwidget.cpp

@@ -62,6 +62,7 @@ AndroidBuildApkInnerWidget::AndroidBuildApkInnerWidget(AndroidBuildApkStep *step
       m_step(step)
 {
     m_ui->setupUi(this);
+    setDisplayName(tr("<b>Build Android APK</b>"));
 
     // Target sdk combobox
     const int minApiSupported = AndroidManager::apiLevelRange().first;
@@ -133,11 +134,6 @@ AndroidBuildApkInnerWidget::~AndroidBuildApkInnerWidget()
     delete m_ui;
 }
 
-QString AndroidBuildApkInnerWidget::displayName() const
-{
-    return tr("<b>Build Android APK</b>");
-}
-
 QString AndroidBuildApkInnerWidget::summaryText() const
 {
     return displayName();
@@ -233,6 +229,8 @@ AndroidBuildApkWidget::AndroidBuildApkWidget(AndroidBuildApkStep *step) :
     BuildStepConfigWidget(step),
     m_step(step)
 {
+    setDisplayName(tr("<b>Build Android APK</b>"));
+
     m_extraLibraryListModel = new AndroidExtraLibraryListModel(m_step->target(), this);
 
     auto base = new AndroidBuildApkInnerWidget(step);
@@ -328,10 +326,5 @@ QString AndroidBuildApkWidget::summaryText() const
     return tr("<b>Build Android APK</b>");
 }
 
-QString AndroidBuildApkWidget::displayName() const
-{
-    return summaryText();
-}
-
 } // Internal
 } // Android

src/plugins/android/androidbuildapkwidget.h

@@ -64,7 +64,6 @@ private:
     void signPackageCheckBoxToggled(bool checked);
 
     QString summaryText() const override;
-    QString displayName() const override;
     void setCertificates();
 
     Ui::AndroidBuildApkWidget *m_ui;
@@ -87,7 +86,6 @@ private:
     void checkEnableRemoveButton();
 
     QString summaryText() const final;
-    QString displayName() const final;
 
 private:
     QListView *m_androidExtraLibsListView = nullptr;

src/plugins/android/androiddeployqtwidget.cpp

@@ -41,6 +41,7 @@ AndroidDeployQtWidget::AndroidDeployQtWidget(AndroidDeployQtStep *step)
       m_step(step)
 {
     m_ui->setupUi(this);
+    setDisplayName(tr("<b>Deploy configurations</b>"));
 
     m_ui->uninstallPreviousPackage->setChecked(m_step->uninstallPreviousPackage() > AndroidDeployQtStep::Keep);
     m_ui->uninstallPreviousPackage->setEnabled(m_step->uninstallPreviousPackage() != AndroidDeployQtStep::ForceUnintall);
@@ -60,11 +61,6 @@ AndroidDeployQtWidget::~AndroidDeployQtWidget()
     delete m_ui;
 }
 
-QString AndroidDeployQtWidget::displayName() const
-{
-    return tr("<b>Deploy configurations</b>");
-}
-
 QString AndroidDeployQtWidget::summaryText() const
 {
     return displayName();

src/plugins/android/androiddeployqtwidget.h

@@ -52,7 +52,6 @@ private:
     void resetDefaultDevices();
 
     QString summaryText() const override;
-    QString displayName() const override;
 
     Ui::AndroidDeployQtWidget *m_ui;
     AndroidDeployQtStep *m_step;

src/plugins/android/androidpackageinstallationstep.cpp

@@ -128,6 +128,7 @@ namespace Internal {
 AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step)
     : BuildStepConfigWidget(step, false)
 {
+    setDisplayName(tr("Make install"));
 }
 
 QString AndroidPackageInstallationStepWidget::summaryText() const
@@ -135,11 +136,6 @@ QString AndroidPackageInstallationStepWidget::summaryText() const
     return "<b>" + tr("Make install") + "</b>";
 }
 
-QString AndroidPackageInstallationStepWidget::displayName() const
-{
-    return tr("Make install");
-}
-
 //
 // AndroidPackageInstallationStepFactory
 //

src/plugins/android/androidpackageinstallationstep.h

@@ -60,7 +60,6 @@ public:
     AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
 
     QString summaryText() const override;
-    QString displayName() const override;
 };
 
 class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory