ProjectExplorer: Pass Id to BuildStep constructor

Allows to use constants in fewer places, similar to what e.g.
RunConfiguration does.

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

src/plugins/android/androidbuildapkstep.cpp

@@ -140,8 +140,8 @@ static FilePath aabPath(const BuildConfiguration *bc)
             .pathAppended(QString("build/outputs/bundle/%1/android-build-%1.aab").arg(buildType));
 }
 
-AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
+AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id)
-    : AbstractProcessStep(parent, Constants::ANDROID_BUILD_APK_ID),
+    : AbstractProcessStep(parent, id),
       m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations::
                                          sdkManager()->latestAndroidSdkPlatform()))
 {

src/plugins/android/androidbuildapkstep.h

@@ -43,7 +43,7 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
     Q_OBJECT
 
 public:
-    AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc);
+    AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;

src/plugins/android/androiddeployqtstep.cpp

@@ -137,8 +137,8 @@ public:
 
 // AndroidDeployQtStep
 
-AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent)
+AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Core::Id id)
-    : ProjectExplorer::BuildStep(parent, stepId())
+    : BuildStep(parent, id)
 {
     setImmutable(true);
     m_uninstallPreviousPackage = QtSupport::QtKitAspect::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0);

src/plugins/android/androiddeployqtstep.h

@@ -64,8 +64,8 @@ public:
         Uninstall,
         ForceUnintall
     };
-public:
+
-    explicit AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc);
+    AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
 
     static Core::Id stepId();
 

src/plugins/android/androidpackageinstallationstep.cpp

@@ -48,8 +48,8 @@ using namespace Android::Internal;
 
 namespace Android {
 
-AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl)
+AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id)
-    : AbstractProcessStep(bsl, Constants::ANDROID_PACKAGE_INSTALLATION_STEP_ID)
+    : AbstractProcessStep(bsl, id)
 {
     const QString name = tr("Copy application data");
     setDefaultDisplayName(name);

src/plugins/android/androidpackageinstallationstep.h

@@ -37,7 +37,7 @@ class ANDROID_EXPORT AndroidPackageInstallationStep : public ProjectExplorer::Ab
     Q_OBJECT
 
 public:
-    explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl);
+    AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
 

src/plugins/autotoolsprojectmanager/autogenstep.cpp

@@ -54,7 +54,7 @@ AutogenStepFactory::AutogenStepFactory()
 
 // AutogenStep
 
-AutogenStep::AutogenStep(BuildStepList *bsl) : AbstractProcessStep(bsl, Constants::AUTOGEN_STEP_ID)
+AutogenStep::AutogenStep(BuildStepList *bsl, Core::Id id) : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autogen"));
 

src/plugins/autotoolsprojectmanager/autogenstep.h

@@ -64,7 +64,7 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    explicit AutogenStep(ProjectExplorer::BuildStepList *bsl);
+    AutogenStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
 private:
     bool init() override;

src/plugins/autotoolsprojectmanager/autoreconfstep.cpp

@@ -51,8 +51,8 @@ AutoreconfStepFactory::AutoreconfStepFactory()
 
 // AutoreconfStep class
 
-AutoreconfStep::AutoreconfStep(BuildStepList *bsl)
+AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Core::Id id)
-    : AbstractProcessStep(bsl, Constants::AUTORECONF_STEP_ID)
+    : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Autoreconf"));
 

src/plugins/autotoolsprojectmanager/autoreconfstep.h

@@ -64,7 +64,7 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    explicit AutoreconfStep(ProjectExplorer::BuildStepList *bsl);
+    AutoreconfStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     bool init() override;
     void doRun() override;

src/plugins/autotoolsprojectmanager/configurestep.cpp

@@ -70,8 +70,8 @@ ConfigureStepFactory::ConfigureStepFactory()
 
 // ConfigureStep
 
-ConfigureStep::ConfigureStep(BuildStepList *bsl)
+ConfigureStep::ConfigureStep(BuildStepList *bsl, Core::Id id)
-    : AbstractProcessStep(bsl, Constants::CONFIGURE_STEP_ID)
+    : AbstractProcessStep(bsl, id)
 {
     setDefaultDisplayName(tr("Configure"));
 

src/plugins/autotoolsprojectmanager/configurestep.h

@@ -65,7 +65,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    explicit ConfigureStep(ProjectExplorer::BuildStepList *bsl);
+    ConfigureStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     void setAdditionalArguments(const QString &list);
 

src/plugins/autotoolsprojectmanager/makestep.cpp

@@ -46,8 +46,8 @@ MakeStepFactory::MakeStepFactory()
 
 // MakeStep
 
-MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl)
+MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
-    : ProjectExplorer::MakeStep(bsl, MAKE_STEP_ID)
+    : ProjectExplorer::MakeStep(bsl, id)
 {
     setAvailableBuildTargets({"all", "clean"});
     if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {

src/plugins/autotoolsprojectmanager/makestep.h

@@ -49,7 +49,7 @@ class MakeStep : public ProjectExplorer::MakeStep
     Q_OBJECT
 
 public:
-    explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
+    MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 };
 
 } // namespace Internal

src/plugins/boot2qt/qdbmakedefaultappstep.cpp

@@ -34,8 +34,8 @@ using namespace ProjectExplorer;
 namespace Qdb {
 namespace Internal {
 
-QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl)
+QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl, Core::Id id)
-    : AbstractRemoteLinuxDeployStep(bsl, stepId())
+    : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     setDefaultDisplayName(stepDisplayName());
 

src/plugins/boot2qt/qdbmakedefaultappstep.h

@@ -35,7 +35,7 @@ class QdbMakeDefaultAppStep : public RemoteLinux::AbstractRemoteLinuxDeployStep
     Q_OBJECT
 
 public:
-    explicit QdbMakeDefaultAppStep(ProjectExplorer::BuildStepList *bsl);
+    QdbMakeDefaultAppStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     static Core::Id stepId();
     static QString stepDisplayName();

src/plugins/boot2qt/qdbstopapplicationstep.cpp

@@ -30,8 +30,8 @@
 namespace Qdb {
 namespace Internal {
 
-QdbStopApplicationStep::QdbStopApplicationStep(ProjectExplorer::BuildStepList *bsl)
+QdbStopApplicationStep::QdbStopApplicationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
-    : AbstractRemoteLinuxDeployStep(bsl, stepId())
+    : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<QdbStopApplicationService>();
 

src/plugins/boot2qt/qdbstopapplicationstep.h

@@ -34,7 +34,7 @@ class QdbStopApplicationStep : public RemoteLinux::AbstractRemoteLinuxDeployStep
 {
     Q_OBJECT
 public:
-    explicit QdbStopApplicationStep(ProjectExplorer::BuildStepList *bsl);
+    QdbStopApplicationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     static Core::Id stepId();
     static QString stepDisplayName();

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -76,8 +76,8 @@ static bool isCurrentExecutableTarget(const QString &target)
     return target == ADD_RUNCONFIGURATION_TEXT;
 }
 
-CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl) :
+CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Core::Id id) :
-    AbstractProcessStep(bsl, Constants::CMAKE_BUILD_STEP_ID)
+    AbstractProcessStep(bsl, id)
 {
     m_percentProgress = QRegExp("^\\[\\s*(\\d*)%\\]");
     m_ninjaProgress = QRegExp("^\\[\\s*(\\d*)/\\s*(\\d*)");

src/plugins/cmakeprojectmanager/cmakebuildstep.h

@@ -56,7 +56,7 @@ class CMakeBuildStep : public ProjectExplorer::AbstractProcessStep
     friend class CMakeBuildStepFactory;
 
 public:
-    explicit CMakeBuildStep(ProjectExplorer::BuildStepList *bsl);
+    CMakeBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     CMakeBuildConfiguration *cmakeBuildConfiguration() const;
 

src/plugins/genericprojectmanager/genericmakestep.cpp

@@ -34,8 +34,8 @@ using namespace ProjectExplorer;
 namespace GenericProjectManager {
 namespace Internal {
 
-GenericMakeStep::GenericMakeStep(BuildStepList *parent)
+GenericMakeStep::GenericMakeStep(BuildStepList *parent, Core::Id id)
-    : MakeStep(parent, Constants::GENERIC_MS_ID)
+    : MakeStep(parent, id)
 {
     if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD) {
         setBuildTarget("all");

src/plugins/genericprojectmanager/genericmakestep.h

@@ -37,7 +37,7 @@ class GenericMakeStep : public ProjectExplorer::MakeStep
     Q_OBJECT
 
 public:
-    explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent);
+    explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 };
 
 class GenericMakeStepFactory : public ProjectExplorer::BuildStepFactory

src/plugins/ios/iosbuildstep.cpp

@@ -163,8 +163,8 @@ private:
     QLineEdit *m_extraArgumentsLineEdit;
 };
 
-IosBuildStep::IosBuildStep(BuildStepList *parent) :
+IosBuildStep::IosBuildStep(BuildStepList *parent, Id id)
-    AbstractProcessStep(parent, IOS_BUILD_STEP_ID)
+    : AbstractProcessStep(parent, id)
 {
     setDefaultDisplayName(QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep",
                                                       IOS_BUILD_STEP_DISPLAY_NAME));

src/plugins/ios/iosbuildstep.h

@@ -45,7 +45,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
     friend class IosBuildStepFactory;
 
 public:
-    explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
+    IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
     void setBaseArguments(const QStringList &args);

src/plugins/ios/iosdeploystep.cpp

@@ -55,8 +55,8 @@ using namespace Utils;
 namespace Ios {
 namespace Internal {
 
-IosDeployStep::IosDeployStep(BuildStepList *parent)
+IosDeployStep::IosDeployStep(BuildStepList *parent, Core::Id id)
-    : BuildStep(parent, stepId())
+    : BuildStep(parent, id)
 {
     setImmutable(true);
     updateDisplayNames();

src/plugins/ios/iosdeploystep.h

@@ -50,7 +50,7 @@ public:
     };
 
     friend class IosDeployStepFactory;
-    explicit IosDeployStep(ProjectExplorer::BuildStepList *bc);
+    IosDeployStep(ProjectExplorer::BuildStepList *bc, Core::Id id);
     static Core::Id stepId();
 
     void cleanup();

src/plugins/ios/iosdsymbuildstep.cpp

@@ -59,8 +59,8 @@ static const char COMMAND_PARTIAL_KEY[] = ".Command";
 static const char ARGUMENTS_PARTIAL_KEY[] = ".Arguments";
 static const char CLEAN_PARTIAL_KEY[] = ".Clean";
 
-IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent) :
+IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) :
-    AbstractProcessStep(parent, Constants::IOS_DSYM_BUILD_STEP_ID),
+    AbstractProcessStep(parent, id),
     m_clean(parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
 {
 }

src/plugins/ios/iosdsymbuildstep.h

@@ -42,7 +42,7 @@ class IosDsymBuildStep : public ProjectExplorer::AbstractProcessStep
     friend class IosDsymBuildStepConfigWidget;
 
 public:
-    IosDsymBuildStep(ProjectExplorer::BuildStepList *parent);
+    IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
     void setArguments(const QStringList &args);

src/plugins/nim/project/nimblebuildconfiguration.cpp

@@ -26,7 +26,7 @@
 #include "nimblebuildconfiguration.h"
 
 #include "nimconstants.h"
-#include "nimblebuildstep.h"
+//#include "nimblebuildstep.h"
 #include "nimbleproject.h"
 #include "nimblebuildsystem.h"
 
@@ -53,23 +53,11 @@ NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Core::Id id)
     setConfigWidgetDisplayName(tr("General"));
     setConfigWidgetHasFrame(true);
     setBuildDirectorySettingsKey("Nim.NimbleBuildConfiguration.BuildDirectory");
+    appendInitialBuildStep(Constants::C_NIMBLEBUILDSTEP_ID);
 
     setInitializer([this](const BuildInfo &info) {
-
         m_buildType = info.buildType;
-
         setBuildDirectory(project()->projectDirectory());
-
-        // FIXME: This is the wrong place for this decision, as it depends on
-        // information that's typically only available after parsing which takes
-        // the build configuration that is initialized here into account.
-
-        //   // Don't add a nimble build step when the package has no binaries (i.e a library package)
-        // m_nimbleBuildSystem = dynamic_cast<NimbleBuildSystem *>(buildSystem());
-        //    if (!m_nimbleBuildSystem->metadata().bin.empty())
-        //    {
-        buildSteps()->appendStep(new NimbleBuildStep(buildSteps()));
-        //    }
     });
 }
 

src/plugins/nim/project/nimblebuildstep.cpp

@@ -98,8 +98,8 @@ private:
 
 }
 
-NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList)
+NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList, Core::Id id)
-    : AbstractProcessStep(parentList, Constants::C_NIMBLEBUILDSTEP_ID)
+    : AbstractProcessStep(parentList, id)
 {
     setDefaultDisplayName(tr(Constants::C_NIMBLEBUILDSTEP_DISPLAY));
     setDisplayName(tr(Constants::C_NIMBLEBUILDSTEP_DISPLAY));

src/plugins/nim/project/nimblebuildstep.h

@@ -34,7 +34,7 @@ class NimbleBuildStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    NimbleBuildStep(ProjectExplorer::BuildStepList *parentList);
+    NimbleBuildStep(ProjectExplorer::BuildStepList *parentList, Core::Id id);
 
     bool init() override;
 

src/plugins/nim/project/nimbletaskstep.cpp

@@ -38,8 +38,8 @@
 using namespace Nim;
 using namespace ProjectExplorer;
 
-NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList)
+NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Core::Id id)
-    : AbstractProcessStep(parentList, Constants::C_NIMBLETASKSTEP_ID)
+    : AbstractProcessStep(parentList, id)
 {
     setDefaultDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY));
     setDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY));

src/plugins/nim/project/nimbletaskstep.h

@@ -34,7 +34,7 @@ class NimbleTaskStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    NimbleTaskStep(ProjectExplorer::BuildStepList *parentList);
+    NimbleTaskStep(ProjectExplorer::BuildStepList *parentList, Core::Id id);
 
     bool init() override;
 

src/plugins/nim/project/nimbuildconfiguration.cpp

@@ -72,6 +72,8 @@ NimBuildConfiguration::NimBuildConfiguration(Target *target, Core::Id id)
     setConfigWidgetHasFrame(true);
     setBuildDirectorySettingsKey("Nim.NimBuildConfiguration.BuildDirectory");
 
+    appendInitialBuildStep(Constants::C_NIMCOMPILERBUILDSTEP_ID);
+    appendInitialCleanStep(Constants::C_NIMCOMPILERCLEANSTEP_ID);
 
     setInitializer([this, target](const BuildInfo &info) {
         // Create the build configuration and initialize it from build info
@@ -80,34 +82,28 @@ NimBuildConfiguration::NimBuildConfiguration(Target *target, Core::Id id)
                                                 displayName(),
                                                 buildType()));
 
-        // Add nim compiler build step
+        auto nimCompilerBuildStep = buildSteps()->firstOfType<NimCompilerBuildStep>();
-        {
+        QTC_ASSERT(nimCompilerBuildStep, return);
-            auto nimCompilerBuildStep = new NimCompilerBuildStep(buildSteps());
+        NimCompilerBuildStep::DefaultBuildOptions defaultOption;
-            NimCompilerBuildStep::DefaultBuildOptions defaultOption;
+        switch (info.buildType) {
-            switch (info.buildType) {
+        case BuildConfiguration::Release:
-            case BuildConfiguration::Release:
+            defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Release;
-                defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Release;
+            break;
-                break;
+        case BuildConfiguration::Debug:
-            case BuildConfiguration::Debug:
+            defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Debug;
-                defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Debug;
+            break;
-                break;
+        default:
-            default:
+            defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Empty;
-                defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Empty;
+            break;
-                break;
-            }
-            nimCompilerBuildStep->setDefaultCompilerOptions(defaultOption);
-
-            const Utils::FilePaths nimFiles = project()->files([](const Node *n) {
-                return Project::AllFiles(n) && n->path().endsWith(".nim");
-            });
-
-            if (!nimFiles.isEmpty())
-                nimCompilerBuildStep->setTargetNimFile(nimFiles.first());
-            buildSteps()->appendStep(nimCompilerBuildStep);
         }
+        nimCompilerBuildStep->setDefaultCompilerOptions(defaultOption);
 
-        // Add clean step
+        const Utils::FilePaths nimFiles = project()->files([](const Node *n) {
-        cleanSteps()->appendStep(Constants::C_NIMCOMPILERCLEANSTEP_ID);
+            return Project::AllFiles(n) && n->path().endsWith(".nim");
+        });
+
+        if (!nimFiles.isEmpty())
+            nimCompilerBuildStep->setTargetNimFile(nimFiles.first());
     });
 }
 

src/plugins/nim/project/nimcompilerbuildstep.cpp

@@ -98,8 +98,8 @@ private:
     }
 };
 
-NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList)
+NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Core::Id id)
-    : AbstractProcessStep(parentList, Constants::C_NIMCOMPILERBUILDSTEP_ID)
+    : AbstractProcessStep(parentList, id)
 {
     setDefaultDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEP_DISPLAY));
     setDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEP_DISPLAY));

src/plugins/nim/project/nimcompilerbuildstep.h

@@ -39,7 +39,7 @@ class NimCompilerBuildStep : public ProjectExplorer::AbstractProcessStep
 public:
     enum DefaultBuildOptions { Empty = 0, Debug, Release};
 
-    NimCompilerBuildStep(ProjectExplorer::BuildStepList *parentList);
+    NimCompilerBuildStep(ProjectExplorer::BuildStepList *parentList, Core::Id id);
 
     bool init() override;
     ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;

src/plugins/nim/project/nimcompilercleanstep.cpp

@@ -40,8 +40,8 @@ using namespace Utils;
 
 namespace Nim {
 
-NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList)
+NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Core::Id id)
-    : BuildStep(parentList, Constants::C_NIMCOMPILERCLEANSTEP_ID)
+    : BuildStep(parentList, id)
 {
     setDefaultDisplayName(tr("Nim Clean Step"));
     setDisplayName(tr("Nim Clean Step"));

src/plugins/nim/project/nimcompilercleanstep.h

@@ -36,7 +36,7 @@ class NimCompilerCleanStep : public ProjectExplorer::BuildStep
     Q_OBJECT
 
 public:
-    NimCompilerCleanStep(ProjectExplorer::BuildStepList *parentList);
+    NimCompilerCleanStep(ProjectExplorer::BuildStepList *parentList, Core::Id id);
 
 private:
     bool init() override;

src/plugins/projectexplorer/buildstep.h

@@ -184,7 +184,7 @@ protected:
     {
         QTC_CHECK(!m_info.creator);
         m_info.id = id;
-        m_info.creator = [](BuildStepList *bsl) { return new BuildStepType(bsl); };
+        m_info.creator = [id](BuildStepList *bsl) { return new BuildStepType(bsl, id); };
     }
 
     void setSupportedStepList(Core::Id id);

src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp

@@ -35,8 +35,8 @@
 
 using namespace ProjectExplorer;
 
-DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl)
+DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id)
-    : BuildStep(bsl, stepId())
+    : BuildStep(bsl, id)
 {
     setDefaultDisplayName(displayName());
     setWidgetExpandedByDefault(false);

src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h

@@ -30,13 +30,12 @@
 
 namespace ProjectExplorer {
 
-class BuildStepList;
-
 class PROJECTEXPLORER_EXPORT DeviceCheckBuildStep : public BuildStep
 {
     Q_OBJECT
+
 public:
-    explicit DeviceCheckBuildStep(BuildStepList *bsl);
+    DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id);
 
     bool init() override;
     void doRun() override;

src/plugins/projectexplorer/processstep.cpp

@@ -46,8 +46,8 @@ const char PROCESS_COMMAND_KEY[] = "ProjectExplorer.ProcessStep.Command";
 const char PROCESS_WORKINGDIRECTORY_KEY[] = "ProjectExplorer.ProcessStep.WorkingDirectory";
 const char PROCESS_ARGUMENTS_KEY[] = "ProjectExplorer.ProcessStep.Arguments";
 
-ProcessStep::ProcessStep(BuildStepList *bsl)
+ProcessStep::ProcessStep(BuildStepList *bsl, Core::Id id)
-    : AbstractProcessStep(bsl, Constants::PROCESS_STEP_ID)
+    : AbstractProcessStep(bsl, id)
 {
     //: Default ProcessStep display name
     setDefaultDisplayName(tr("Custom Process Step"));
@@ -115,7 +115,7 @@ void ProcessStep::setupProcessParameters(ProcessParameters *pp)
 
 ProcessStepFactory::ProcessStepFactory()
 {
-    registerStep<ProcessStep>(Constants::PROCESS_STEP_ID);
+    registerStep<ProcessStep>("ProjectExplorer.ProcessStep");
     setDisplayName(ProcessStep::tr("Custom Process Step", "item in combobox"));
 }
 

src/plugins/projectexplorer/processstep.h

@@ -43,7 +43,7 @@ class PROJECTEXPLORER_EXPORT ProcessStep : public AbstractProcessStep
     friend class ProcessStepFactory;
 
 public:
-    explicit ProcessStep(BuildStepList *bsl);
+    ProcessStep(BuildStepList *bsl, Core::Id id);
 
 private:
     bool init() override;

src/plugins/projectexplorer/projectexplorerconstants.h

@@ -152,8 +152,6 @@ const char BUILDSTEPS_CLEAN[] = "ProjectExplorer.BuildSteps.Clean";
 const char BUILDSTEPS_BUILD[] = "ProjectExplorer.BuildSteps.Build";
 const char BUILDSTEPS_DEPLOY[] = "ProjectExplorer.BuildSteps.Deploy";
 
-const char PROCESS_STEP_ID[] = "ProjectExplorer.ProcessStep";
-
 // Language
 
 // Keep these short: These constants are exposed to the MacroExplorer!

src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp

@@ -80,6 +80,9 @@ QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
 {
     setConfigWidgetHasFrame(true);
 
+    appendInitialBuildStep(Constants::QBS_BUILDSTEP_ID);
+    appendInitialCleanStep(Constants::QBS_CLEANSTEP_ID);
+
     setInitializer([this, target](const BuildInfo &info) {
         const Kit *kit = target->kit();
         QVariantMap configData = info.extraInfo.value<QVariantMap>();
@@ -112,11 +115,9 @@ QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
 
         m_configurationName->setValue(uniqueConfigName);
 
-        auto bs = new QbsBuildStep(buildSteps());
+        auto bs = buildSteps()->firstOfType<QbsBuildStep>();
+        QTC_ASSERT(bs, return);
         bs->setQbsConfiguration(bd);
-        buildSteps()->appendStep(bs);
-
-        cleanSteps()->appendStep(Constants::QBS_CLEANSTEP_ID);
 
         emit qbsConfigurationChanged();
     });

src/plugins/qbsprojectmanager/qbsbuildstep.cpp

@@ -137,8 +137,8 @@ private:
 // QbsBuildStep:
 // --------------------------------------------------------------------
 
-QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) :
+QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Core::Id id) :
-    ProjectExplorer::BuildStep(bsl, Constants::QBS_BUILDSTEP_ID)
+    BuildStep(bsl, id)
 {
     setDisplayName(tr("Qbs Build"));
     setQbsConfiguration(QVariantMap());

src/plugins/qbsprojectmanager/qbsbuildstep.h

@@ -51,7 +51,7 @@ public:
         ExpandVariables
     };
 
-    explicit QbsBuildStep(ProjectExplorer::BuildStepList *bsl);
+    QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
     ~QbsBuildStep() override;
 
     QVariantMap qbsConfiguration(VariableHandling variableHandling) const;

src/plugins/qbsprojectmanager/qbscleanstep.cpp

@@ -49,8 +49,8 @@ namespace Internal {
 // QbsCleanStep:
 // --------------------------------------------------------------------
 
-QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl) :
+QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id id)
-    ProjectExplorer::BuildStep(bsl, Constants::QBS_CLEANSTEP_ID)
+    : BuildStep(bsl, id)
 {
     setDisplayName(tr("Qbs Clean"));
 
@@ -153,11 +153,6 @@ void QbsCleanStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, con
     emit addOutput(message, OutputFormat::Stdout);
 }
 
-QbsBuildSystem *QbsCleanStep::qbsBuildSystem() const
-{
-    return static_cast<QbsBuildSystem *>(buildSystem());
-}
-
 // --------------------------------------------------------------------
 // QbsCleanStepFactory:
 // --------------------------------------------------------------------

src/plugins/qbsprojectmanager/qbscleanstep.h

@@ -41,7 +41,7 @@ class QbsCleanStep : public ProjectExplorer::BuildStep
     Q_OBJECT
 
 public:
-    explicit QbsCleanStep(ProjectExplorer::BuildStepList *bsl);
+    QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
     ~QbsCleanStep() override;
 
     bool dryRun() const { return m_dryRunAspect->value(); }
@@ -62,8 +62,6 @@ private:
     ProjectExplorer::BaseBoolAspect *m_dryRunAspect = nullptr;
     ProjectExplorer::BaseBoolAspect *m_keepGoingAspect = nullptr;
 
-    QbsBuildSystem *qbsBuildSystem() const;
-
     QStringList m_products;
     QbsSession *m_session = nullptr;
     QString m_description;

src/plugins/qbsprojectmanager/qbsinstallstep.cpp

@@ -87,8 +87,8 @@ private:
 // QbsInstallStep:
 // --------------------------------------------------------------------
 
-QbsInstallStep::QbsInstallStep(ProjectExplorer::BuildStepList *bsl) :
+QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Core::Id id)
-    ProjectExplorer::BuildStep(bsl, Constants::QBS_INSTALLSTEP_ID)
+    : BuildStep(bsl, id)
 {
     setDisplayName(tr("Qbs Install"));
 

src/plugins/qbsprojectmanager/qbsinstallstep.h

@@ -41,7 +41,7 @@ class QbsInstallStep : public ProjectExplorer::BuildStep
     Q_OBJECT
 
 public:
-    explicit QbsInstallStep(ProjectExplorer::BuildStepList *bsl);
+    QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
     ~QbsInstallStep() override;
 
     QString installRoot() const;

src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp

@@ -111,12 +111,13 @@ QmakeBuildConfiguration::QmakeBuildConfiguration(Target *target, Core::Id id)
 
     m_buildSystem = new QmakeBuildSystem(this);
 
+    appendInitialBuildStep(Constants::QMAKE_BS_ID);
+    appendInitialBuildStep(Constants::MAKESTEP_BS_ID);
     appendInitialCleanStep(Constants::MAKESTEP_BS_ID);
 
     setInitializer([this, target](const BuildInfo &info) {
-        auto qmakeStep = new QMakeStep(buildSteps());
+        auto qmakeStep = buildSteps()->firstOfType<QMakeStep>();
-        buildSteps()->appendStep(qmakeStep);
+        QTC_ASSERT(qmakeStep, return);
-        buildSteps()->appendStep(Constants::MAKESTEP_BS_ID);
 
         const QmakeExtraBuildInfo qmakeExtra = info.extraInfo.value<QmakeExtraBuildInfo>();
         BaseQtVersion *version = QtKitAspect::qtVersion(target->kit());

src/plugins/qmakeprojectmanager/qmakemakestep.cpp

@@ -52,8 +52,8 @@ using namespace ProjectExplorer;
 using namespace QmakeProjectManager;
 using namespace QmakeProjectManager::Internal;
 
-QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl)
+QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Core::Id id)
-    : MakeStep(bsl, Constants::MAKESTEP_BS_ID)
+    : MakeStep(bsl, id)
 {
     if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
         setClean(true);

src/plugins/qmakeprojectmanager/qmakemakestep.h

@@ -47,7 +47,7 @@ class QMAKEPROJECTMANAGER_EXPORT QmakeMakeStep : public ProjectExplorer::MakeSte
     Q_OBJECT
 
 public:
-    explicit QmakeMakeStep(ProjectExplorer::BuildStepList *bsl);
+    QmakeMakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
 private:
     void finish(bool success) override;

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -74,7 +74,8 @@ const char QMAKE_ARGUMENTS_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeArgumen
 const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced";
 }
 
-QMakeStep::QMakeStep(BuildStepList *bsl) : AbstractProcessStep(bsl, Constants::QMAKE_BS_ID)
+QMakeStep::QMakeStep(BuildStepList *bsl, Core::Id id)
+    : AbstractProcessStep(bsl, id)
 {
     //: QMakeStep default display name
     setDefaultDisplayName(tr("qmake"));

src/plugins/qmakeprojectmanager/qmakestep.h

@@ -116,7 +116,7 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractPro
     friend class Internal::QMakeStepFactory;
 
 public:
-    explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
+    QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 
     QmakeBuildConfiguration *qmakeBuildConfiguration() const;
     QmakeBuildSystem *qmakeBuildSystem() const;

src/plugins/remotelinux/genericdirectuploadstep.cpp

@@ -35,8 +35,8 @@ using namespace ProjectExplorer;
 
 namespace RemoteLinux {
 
-GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl)
+GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Core::Id id)
-    : AbstractRemoteLinuxDeployStep(bsl, stepId())
+    : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<GenericDirectUploadService>();
 

src/plugins/remotelinux/genericdirectuploadstep.h

@@ -35,7 +35,7 @@ class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDep
     Q_OBJECT
 
 public:
-    explicit GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl);
+    GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
     ~GenericDirectUploadStep() override;
 
     static Core::Id stepId();

src/plugins/remotelinux/makeinstallstep.cpp

@@ -53,7 +53,7 @@ const char CleanInstallRootAspectId[] = "RemoteLinux.MakeInstall.CleanInstallRoo
 const char FullCommandLineAspectId[] = "RemoteLinux.MakeInstall.FullCommandLine";
 const char CustomCommandLineAspectId[] = "RemoteLinux.MakeInstall.CustomCommandLine";
 
-MakeInstallStep::MakeInstallStep(BuildStepList *parent) : MakeStep(parent, stepId())
+MakeInstallStep::MakeInstallStep(BuildStepList *parent, Core::Id id) : MakeStep(parent, id)
 {
     setDefaultDisplayName(displayName());
 

src/plugins/remotelinux/makeinstallstep.h

@@ -39,7 +39,7 @@ class REMOTELINUX_EXPORT MakeInstallStep : public ProjectExplorer::MakeStep
 {
     Q_OBJECT
 public:
-    MakeInstallStep(ProjectExplorer::BuildStepList *parent);
+    MakeInstallStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
 
     static Core::Id stepId();
     static QString displayName();

src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp

@@ -35,8 +35,9 @@ using namespace ProjectExplorer;
 
 namespace RemoteLinux {
 
-RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep(BuildStepList *bsl)
+RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep
-        : AbstractRemoteLinuxDeployStep(bsl, stepId())
+    (BuildStepList *bsl, Core::Id id)
+        : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     setDefaultDisplayName(displayName());
 

src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h

@@ -34,7 +34,7 @@ class REMOTELINUX_EXPORT RemoteLinuxCheckForFreeDiskSpaceStep : public AbstractR
     Q_OBJECT
 
 public:
-    explicit RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl);
+    RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
     ~RemoteLinuxCheckForFreeDiskSpaceStep() override;
 
     static Core::Id stepId();

src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp

@@ -32,8 +32,9 @@ using namespace ProjectExplorer;
 
 namespace RemoteLinux {
 
-RemoteLinuxCustomCommandDeploymentStep::RemoteLinuxCustomCommandDeploymentStep(BuildStepList *bsl)
+RemoteLinuxCustomCommandDeploymentStep::RemoteLinuxCustomCommandDeploymentStep
-    : AbstractRemoteLinuxDeployStep(bsl, stepId())
+        (BuildStepList *bsl, Core::Id id)
+    : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<RemoteLinuxCustomCommandDeployService>();
 

src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h

@@ -35,7 +35,7 @@ class REMOTELINUX_EXPORT RemoteLinuxCustomCommandDeploymentStep
     Q_OBJECT
 
 public:
-    explicit RemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl);
+    RemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
     ~RemoteLinuxCustomCommandDeploymentStep() override;
 
     static Core::Id stepId();

src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp

@@ -69,8 +69,10 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory()
     };
     setPostRestore([needsMakeInstall](DeployConfiguration *dc, const QVariantMap &map) {
         // 4.9 -> 4.10. See QTCREATORBUG-22689.
-        if (map.value("_checkMakeInstall").toBool() && needsMakeInstall(dc->target()))
+        if (map.value("_checkMakeInstall").toBool() && needsMakeInstall(dc->target())) {
-                dc->stepList()->insertStep(0, new MakeInstallStep(dc->stepList()));
+            auto step = new MakeInstallStep(dc->stepList(), MakeInstallStep::stepId());
+            dc->stepList()->insertStep(0, step);
+        }
     });
 
     addInitialStep(MakeInstallStep::stepId(), needsMakeInstall);

src/plugins/remotelinux/rsyncdeploystep.cpp

@@ -177,8 +177,8 @@ void RsyncDeployService::setFinished()
 
 } // namespace Internal
 
-RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl)
+RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Core::Id id)
-    : AbstractRemoteLinuxDeployStep(bsl, stepId())
+    : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<Internal::RsyncDeployService>();
 

src/plugins/remotelinux/rsyncdeploystep.h

@@ -45,7 +45,7 @@ class REMOTELINUX_EXPORT RsyncDeployStep : public AbstractRemoteLinuxDeployStep
     Q_OBJECT
 
 public:
-    explicit RsyncDeployStep(ProjectExplorer::BuildStepList *bsl);
+    RsyncDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
     ~RsyncDeployStep() override;
 
     static Core::Id stepId();

src/plugins/remotelinux/tarpackagecreationstep.cpp

@@ -70,8 +70,8 @@ struct TarFileHeader {
 
 } // Anonymous namespace.
 
-TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl)
+TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl, Core::Id id)
-    : AbstractPackagingStep(bsl, stepId())
+    : AbstractPackagingStep(bsl, id)
 {
     setDefaultDisplayName(displayName());
 

src/plugins/remotelinux/tarpackagecreationstep.h

@@ -43,7 +43,7 @@ class REMOTELINUX_EXPORT TarPackageCreationStep : public AbstractPackagingStep
 {
     Q_OBJECT
 public:
-    TarPackageCreationStep(ProjectExplorer::BuildStepList *bsl);
+    TarPackageCreationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     static Core::Id stepId();
     static QString displayName();

src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp

@@ -60,8 +60,8 @@ AbstractRemoteLinuxPackageInstaller *UploadAndInstallTarPackageService::packageI
 }
 
 
-UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bsl)
+UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bsl, Core::Id id)
-    : AbstractRemoteLinuxDeployStep(bsl, stepId())
+    : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     auto service = createDeployService<UploadAndInstallTarPackageService>();
 

src/plugins/remotelinux/uploadandinstalltarpackagestep.h

@@ -53,7 +53,7 @@ class REMOTELINUX_EXPORT UploadAndInstallTarPackageStep : public AbstractRemoteL
     Q_OBJECT
 
 public:
-    explicit UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl);
+    UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     static Core::Id stepId();
     static QString displayName();

src/plugins/winrt/winrtpackagedeploymentstep.cpp

@@ -52,8 +52,8 @@ using namespace Utils;
 namespace WinRt {
 namespace Internal {
 
-WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl)
+WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl, Core::Id id)
-    : AbstractProcessStep(bsl, Constants::WINRT_BUILD_STEP_DEPLOY)
+    : AbstractProcessStep(bsl, id)
 {
     setDisplayName(tr("Run windeployqt"));
 

src/plugins/winrt/winrtpackagedeploymentstep.h

@@ -36,7 +36,7 @@ class WinRtPackageDeploymentStep : public ProjectExplorer::AbstractProcessStep
     Q_OBJECT
 
 public:
-    explicit WinRtPackageDeploymentStep(ProjectExplorer::BuildStepList *bsl);
+    WinRtPackageDeploymentStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
 
     QString defaultWinDeployQtArguments() const;