diff options
73 files changed, 140 insertions, 159 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index faa5dd5852..275610b7d3 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/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) - : AbstractProcessStep(parent, Constants::ANDROID_BUILD_APK_ID), +AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent, Core::Id id) + : AbstractProcessStep(parent, id), m_buildTargetSdk(AndroidConfig::apiLevelNameFor(AndroidConfigurations:: sdkManager()->latestAndroidSdkPlatform())) { diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h index 911c0aa8cf..e8a04ac1c7 100644 --- a/src/plugins/android/androidbuildapkstep.h +++ b/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; diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 544b55867c..062a073906 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -137,8 +137,8 @@ public: // AndroidDeployQtStep -AndroidDeployQtStep::AndroidDeployQtStep(ProjectExplorer::BuildStepList *parent) - : ProjectExplorer::BuildStep(parent, stepId()) +AndroidDeployQtStep::AndroidDeployQtStep(BuildStepList *parent, Core::Id id) + : BuildStep(parent, id) { setImmutable(true); m_uninstallPreviousPackage = QtSupport::QtKitAspect::qtVersion(target()->kit())->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0); diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index 6b0091d2ad..c688d51706 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/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(); diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp index b84202c41a..9017513974 100644 --- a/src/plugins/android/androidpackageinstallationstep.cpp +++ b/src/plugins/android/androidpackageinstallationstep.cpp @@ -48,8 +48,8 @@ using namespace Android::Internal; namespace Android { -AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl) - : AbstractProcessStep(bsl, Constants::ANDROID_PACKAGE_INSTALLATION_STEP_ID) +AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id) + : AbstractProcessStep(bsl, id) { const QString name = tr("Copy application data"); setDefaultDisplayName(name); diff --git a/src/plugins/android/androidpackageinstallationstep.h b/src/plugins/android/androidpackageinstallationstep.h index 977d7a23f0..f9e2c7d493 100644 --- a/src/plugins/android/androidpackageinstallationstep.h +++ b/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; diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index 2541c1169c..0d3ef11ff7 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/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")); diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h index e11f01f39b..b0e2c6c553 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.h +++ b/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; diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index eeb3da1118..40f43f2596 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp @@ -51,8 +51,8 @@ AutoreconfStepFactory::AutoreconfStepFactory() // AutoreconfStep class -AutoreconfStep::AutoreconfStep(BuildStepList *bsl) - : AbstractProcessStep(bsl, Constants::AUTORECONF_STEP_ID) +AutoreconfStep::AutoreconfStep(BuildStepList *bsl, Core::Id id) + : AbstractProcessStep(bsl, id) { setDefaultDisplayName(tr("Autoreconf")); diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h index 48348bb14a..35ff0e6859 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h +++ b/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; diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index c722aa3a9f..35d00a17cc 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp @@ -70,8 +70,8 @@ ConfigureStepFactory::ConfigureStepFactory() // ConfigureStep -ConfigureStep::ConfigureStep(BuildStepList *bsl) - : AbstractProcessStep(bsl, Constants::CONFIGURE_STEP_ID) +ConfigureStep::ConfigureStep(BuildStepList *bsl, Core::Id id) + : AbstractProcessStep(bsl, id) { setDefaultDisplayName(tr("Configure")); diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h index 380eb413c0..b2e15de1d6 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.h +++ b/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); diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index 7a7fbbddb3..2905ca9597 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -46,8 +46,8 @@ MakeStepFactory::MakeStepFactory() // MakeStep -MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl) - : ProjectExplorer::MakeStep(bsl, MAKE_STEP_ID) +MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id) + : ProjectExplorer::MakeStep(bsl, id) { setAvailableBuildTargets({"all", "clean"}); if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) { diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h index 77bc2c0be2..211913bb3f 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.h +++ b/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 diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp index 5ddb9fa6c7..917cbf1f41 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappstep.cpp +++ b/src/plugins/boot2qt/qdbmakedefaultappstep.cpp @@ -34,8 +34,8 @@ using namespace ProjectExplorer; namespace Qdb { namespace Internal { -QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) +QdbMakeDefaultAppStep::QdbMakeDefaultAppStep(BuildStepList *bsl, Core::Id id) + : AbstractRemoteLinuxDeployStep(bsl, id) { setDefaultDisplayName(stepDisplayName()); diff --git a/src/plugins/boot2qt/qdbmakedefaultappstep.h b/src/plugins/boot2qt/qdbmakedefaultappstep.h index ffaf0dcab6..59c3c14afc 100644 --- a/src/plugins/boot2qt/qdbmakedefaultappstep.h +++ b/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(); diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.cpp b/src/plugins/boot2qt/qdbstopapplicationstep.cpp index 0005a01712..240d2b8bab 100644 --- a/src/plugins/boot2qt/qdbstopapplicationstep.cpp +++ b/src/plugins/boot2qt/qdbstopapplicationstep.cpp @@ -30,8 +30,8 @@ namespace Qdb { namespace Internal { -QdbStopApplicationStep::QdbStopApplicationStep(ProjectExplorer::BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) +QdbStopApplicationStep::QdbStopApplicationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id) + : AbstractRemoteLinuxDeployStep(bsl, id) { auto service = createDeployService<QdbStopApplicationService>(); diff --git a/src/plugins/boot2qt/qdbstopapplicationstep.h b/src/plugins/boot2qt/qdbstopapplicationstep.h index 2d1fcf69c9..a5e3418396 100644 --- a/src/plugins/boot2qt/qdbstopapplicationstep.h +++ b/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(); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 878f07458b..7e61373c61 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -76,8 +76,8 @@ static bool isCurrentExecutableTarget(const QString &target) return target == ADD_RUNCONFIGURATION_TEXT; } -CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl) : - AbstractProcessStep(bsl, Constants::CMAKE_BUILD_STEP_ID) +CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Core::Id id) : + AbstractProcessStep(bsl, id) { m_percentProgress = QRegExp("^\\[\\s*(\\d*)%\\]"); m_ninjaProgress = QRegExp("^\\[\\s*(\\d*)/\\s*(\\d*)"); diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h index 7c66e43694..1938c88b10 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h +++ b/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; diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index 184aacb11c..e66a938ab3 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -34,8 +34,8 @@ using namespace ProjectExplorer; namespace GenericProjectManager { namespace Internal { -GenericMakeStep::GenericMakeStep(BuildStepList *parent) - : MakeStep(parent, Constants::GENERIC_MS_ID) +GenericMakeStep::GenericMakeStep(BuildStepList *parent, Core::Id id) + : MakeStep(parent, id) { if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD) { setBuildTarget("all"); diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index d48b341f59..5e83216f49 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/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 diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index bbcc3937f6..c881e62267 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -163,8 +163,8 @@ private: QLineEdit *m_extraArgumentsLineEdit; }; -IosBuildStep::IosBuildStep(BuildStepList *parent) : - AbstractProcessStep(parent, IOS_BUILD_STEP_ID) +IosBuildStep::IosBuildStep(BuildStepList *parent, Id id) + : AbstractProcessStep(parent, id) { setDefaultDisplayName(QCoreApplication::translate("GenericProjectManager::Internal::IosBuildStep", IOS_BUILD_STEP_DISPLAY_NAME)); diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index 22953d82f9..3f6145202c 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/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); diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 0ef6dd8593..4e35c0a837 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -55,8 +55,8 @@ using namespace Utils; namespace Ios { namespace Internal { -IosDeployStep::IosDeployStep(BuildStepList *parent) - : BuildStep(parent, stepId()) +IosDeployStep::IosDeployStep(BuildStepList *parent, Core::Id id) + : BuildStep(parent, id) { setImmutable(true); updateDisplayNames(); diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index cff9eaab72..1be492b954 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/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(); diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index cf4e258693..a597f9b0d6 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/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) : - AbstractProcessStep(parent, Constants::IOS_DSYM_BUILD_STEP_ID), +IosDsymBuildStep::IosDsymBuildStep(BuildStepList *parent, Id id) : + AbstractProcessStep(parent, id), m_clean(parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) { } diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index 1d03205e34..effc6e5f91 100644 --- a/src/plugins/ios/iosdsymbuildstep.h +++ b/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); diff --git a/src/plugins/nim/project/nimblebuildconfiguration.cpp b/src/plugins/nim/project/nimblebuildconfiguration.cpp index a4d3de2044..19f4563ccc 100644 --- a/src/plugins/nim/project/nimblebuildconfiguration.cpp +++ b/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())); - // } }); } diff --git a/src/plugins/nim/project/nimblebuildstep.cpp b/src/plugins/nim/project/nimblebuildstep.cpp index 33b686bd4b..be264b9045 100644 --- a/src/plugins/nim/project/nimblebuildstep.cpp +++ b/src/plugins/nim/project/nimblebuildstep.cpp @@ -98,8 +98,8 @@ private: } -NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList) - : AbstractProcessStep(parentList, Constants::C_NIMBLEBUILDSTEP_ID) +NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList, Core::Id id) + : AbstractProcessStep(parentList, id) { setDefaultDisplayName(tr(Constants::C_NIMBLEBUILDSTEP_DISPLAY)); setDisplayName(tr(Constants::C_NIMBLEBUILDSTEP_DISPLAY)); diff --git a/src/plugins/nim/project/nimblebuildstep.h b/src/plugins/nim/project/nimblebuildstep.h index e8bcc18253..3a3af51046 100644 --- a/src/plugins/nim/project/nimblebuildstep.h +++ b/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; diff --git a/src/plugins/nim/project/nimbletaskstep.cpp b/src/plugins/nim/project/nimbletaskstep.cpp index 0608be5915..9498c086eb 100644 --- a/src/plugins/nim/project/nimbletaskstep.cpp +++ b/src/plugins/nim/project/nimbletaskstep.cpp @@ -38,8 +38,8 @@ using namespace Nim; using namespace ProjectExplorer; -NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList) - : AbstractProcessStep(parentList, Constants::C_NIMBLETASKSTEP_ID) +NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Core::Id id) + : AbstractProcessStep(parentList, id) { setDefaultDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY)); setDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY)); diff --git a/src/plugins/nim/project/nimbletaskstep.h b/src/plugins/nim/project/nimbletaskstep.h index 47cf507a8d..f8e7d375d4 100644 --- a/src/plugins/nim/project/nimbletaskstep.h +++ b/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; diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp index fcf3053403..d0abc3f3db 100644 --- a/src/plugins/nim/project/nimbuildconfiguration.cpp +++ b/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 = new NimCompilerBuildStep(buildSteps()); - NimCompilerBuildStep::DefaultBuildOptions defaultOption; - switch (info.buildType) { - case BuildConfiguration::Release: - defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Release; - break; - case BuildConfiguration::Debug: - defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Debug; - break; - default: - defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Empty; - 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); + auto nimCompilerBuildStep = buildSteps()->firstOfType<NimCompilerBuildStep>(); + QTC_ASSERT(nimCompilerBuildStep, return); + NimCompilerBuildStep::DefaultBuildOptions defaultOption; + switch (info.buildType) { + case BuildConfiguration::Release: + defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Release; + break; + case BuildConfiguration::Debug: + defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Debug; + break; + default: + defaultOption = NimCompilerBuildStep::DefaultBuildOptions::Empty; + break; } + nimCompilerBuildStep->setDefaultCompilerOptions(defaultOption); - // Add clean step - cleanSteps()->appendStep(Constants::C_NIMCOMPILERCLEANSTEP_ID); + const Utils::FilePaths nimFiles = project()->files([](const Node *n) { + return Project::AllFiles(n) && n->path().endsWith(".nim"); + }); + + if (!nimFiles.isEmpty()) + nimCompilerBuildStep->setTargetNimFile(nimFiles.first()); }); } diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp index 18fa15d315..9ddb9c75c0 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.cpp +++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp @@ -98,8 +98,8 @@ private: } }; -NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList) - : AbstractProcessStep(parentList, Constants::C_NIMCOMPILERBUILDSTEP_ID) +NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Core::Id id) + : AbstractProcessStep(parentList, id) { setDefaultDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEP_DISPLAY)); setDisplayName(tr(Constants::C_NIMCOMPILERBUILDSTEP_DISPLAY)); diff --git a/src/plugins/nim/project/nimcompilerbuildstep.h b/src/plugins/nim/project/nimcompilerbuildstep.h index b9ea46316f..aca8750c06 100644 --- a/src/plugins/nim/project/nimcompilerbuildstep.h +++ b/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; diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp index 03fa8fd67b..570df83e58 100644 --- a/src/plugins/nim/project/nimcompilercleanstep.cpp +++ b/src/plugins/nim/project/nimcompilercleanstep.cpp @@ -40,8 +40,8 @@ using namespace Utils; namespace Nim { -NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList) - : BuildStep(parentList, Constants::C_NIMCOMPILERCLEANSTEP_ID) +NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Core::Id id) + : BuildStep(parentList, id) { setDefaultDisplayName(tr("Nim Clean Step")); setDisplayName(tr("Nim Clean Step")); diff --git a/src/plugins/nim/project/nimcompilercleanstep.h b/src/plugins/nim/project/nimcompilercleanstep.h index 8acf4e0ae5..483d627b9e 100644 --- a/src/plugins/nim/project/nimcompilercleanstep.h +++ b/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; diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 0c9a85e9b3..4c45fefb7f 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/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); diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp index 29e95751f6..8d8a61d285 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp @@ -35,8 +35,8 @@ using namespace ProjectExplorer; -DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl) - : BuildStep(bsl, stepId()) +DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id) + : BuildStep(bsl, id) { setDefaultDisplayName(displayName()); setWidgetExpandedByDefault(false); diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h index 6fc984b690..ff4dd8aeb8 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h +++ b/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; diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index 89062879d3..c061eee1c1 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/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) - : AbstractProcessStep(bsl, Constants::PROCESS_STEP_ID) +ProcessStep::ProcessStep(BuildStepList *bsl, Core::Id 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")); } diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 4ef741588b..95f0f49a22 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/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; diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index ddac904c2d..4855035908 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/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! diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 4a96af1c55..23dc20c489 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/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(); }); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index e62746b18f..83498281b8 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -137,8 +137,8 @@ private: // QbsBuildStep: // -------------------------------------------------------------------- -QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) : - ProjectExplorer::BuildStep(bsl, Constants::QBS_BUILDSTEP_ID) +QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Core::Id id) : + BuildStep(bsl, id) { setDisplayName(tr("Qbs Build")); setQbsConfiguration(QVariantMap()); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index dc85d255a5..79ab7bb043 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/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; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index 25c09f289a..119047fe9f 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -49,8 +49,8 @@ namespace Internal { // QbsCleanStep: // -------------------------------------------------------------------- -QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl) : - ProjectExplorer::BuildStep(bsl, Constants::QBS_CLEANSTEP_ID) +QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id 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: // -------------------------------------------------------------------- diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 205666ac55..1a5c9f8340 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/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; diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index 1e4f213770..b3f64e7663 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -87,8 +87,8 @@ private: // QbsInstallStep: // -------------------------------------------------------------------- -QbsInstallStep::QbsInstallStep(ProjectExplorer::BuildStepList *bsl) : - ProjectExplorer::BuildStep(bsl, Constants::QBS_INSTALLSTEP_ID) +QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Core::Id id) + : BuildStep(bsl, id) { setDisplayName(tr("Qbs Install")); diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index aad10bcbec..943beaac89 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/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; diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index 6456a97d97..286a6c2d5f 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/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()); - buildSteps()->appendStep(qmakeStep); - buildSteps()->appendStep(Constants::MAKESTEP_BS_ID); + auto qmakeStep = buildSteps()->firstOfType<QMakeStep>(); + QTC_ASSERT(qmakeStep, return); const QmakeExtraBuildInfo qmakeExtra = info.extraInfo.value<QmakeExtraBuildInfo>(); BaseQtVersion *version = QtKitAspect::qtVersion(target->kit()); diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index 3de706a50f..79048cc9ab 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -52,8 +52,8 @@ using namespace ProjectExplorer; using namespace QmakeProjectManager; using namespace QmakeProjectManager::Internal; -QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl) - : MakeStep(bsl, Constants::MAKESTEP_BS_ID) +QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Core::Id id) + : MakeStep(bsl, id) { if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) { setClean(true); diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.h b/src/plugins/qmakeprojectmanager/qmakemakestep.h index 21cd2f0d91..29e5898e01 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.h +++ b/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; diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 5f2b624222..32c3ee5dc5 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/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")); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 8dbc949c76..1dfce91aa1 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/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; diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp index 7b4c55c2ad..ddfa8e1caa 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.cpp +++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp @@ -35,8 +35,8 @@ using namespace ProjectExplorer; namespace RemoteLinux { -GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) +GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Core::Id id) + : AbstractRemoteLinuxDeployStep(bsl, id) { auto service = createDeployService<GenericDirectUploadService>(); diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h index 0577366d9a..cb53b5a6c1 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.h +++ b/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(); diff --git a/src/plugins/remotelinux/makeinstallstep.cpp b/src/plugins/remotelinux/makeinstallstep.cpp index 4ea910daa4..7e82dee01d 100644 --- a/src/plugins/remotelinux/makeinstallstep.cpp +++ b/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()); diff --git a/src/plugins/remotelinux/makeinstallstep.h b/src/plugins/remotelinux/makeinstallstep.h index feec859c8b..76176299cc 100644 --- a/src/plugins/remotelinux/makeinstallstep.h +++ b/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(); diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp index 0db981e144..50271123e9 100644 --- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp +++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.cpp @@ -35,8 +35,9 @@ using namespace ProjectExplorer; namespace RemoteLinux { -RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep(BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) +RemoteLinuxCheckForFreeDiskSpaceStep::RemoteLinuxCheckForFreeDiskSpaceStep + (BuildStepList *bsl, Core::Id id) + : AbstractRemoteLinuxDeployStep(bsl, id) { setDefaultDisplayName(displayName()); diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h index 5dd2cdcc94..dbdd8bb8e6 100644 --- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h +++ b/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(); diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp index 61aebbe893..4f8da7de07 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp @@ -32,8 +32,9 @@ using namespace ProjectExplorer; namespace RemoteLinux { -RemoteLinuxCustomCommandDeploymentStep::RemoteLinuxCustomCommandDeploymentStep(BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) +RemoteLinuxCustomCommandDeploymentStep::RemoteLinuxCustomCommandDeploymentStep + (BuildStepList *bsl, Core::Id id) + : AbstractRemoteLinuxDeployStep(bsl, id) { auto service = createDeployService<RemoteLinuxCustomCommandDeployService>(); diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h index 56f3ecac29..d438ccea4d 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h +++ b/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(); diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index 6bdef06dab..6a81085bf0 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/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())) - dc->stepList()->insertStep(0, new MakeInstallStep(dc->stepList())); + if (map.value("_checkMakeInstall").toBool() && needsMakeInstall(dc->target())) { + auto step = new MakeInstallStep(dc->stepList(), MakeInstallStep::stepId()); + dc->stepList()->insertStep(0, step); + } }); addInitialStep(MakeInstallStep::stepId(), needsMakeInstall); diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp index 16757a6986..10869fcca9 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.cpp +++ b/src/plugins/remotelinux/rsyncdeploystep.cpp @@ -177,8 +177,8 @@ void RsyncDeployService::setFinished() } // namespace Internal -RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) +RsyncDeployStep::RsyncDeployStep(BuildStepList *bsl, Core::Id id) + : AbstractRemoteLinuxDeployStep(bsl, id) { auto service = createDeployService<Internal::RsyncDeployService>(); diff --git a/src/plugins/remotelinux/rsyncdeploystep.h b/src/plugins/remotelinux/rsyncdeploystep.h index 746715d5e3..d8d5c7b45c 100644 --- a/src/plugins/remotelinux/rsyncdeploystep.h +++ b/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(); diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index c529987878..40710efb44 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -70,8 +70,8 @@ struct TarFileHeader { } // Anonymous namespace. -TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl) - : AbstractPackagingStep(bsl, stepId()) +TarPackageCreationStep::TarPackageCreationStep(BuildStepList *bsl, Core::Id id) + : AbstractPackagingStep(bsl, id) { setDefaultDisplayName(displayName()); diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h index fca28eae67..8a93192d69 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.h +++ b/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(); diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp index 585f28da59..bdbf3ff901 100644 --- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp +++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp @@ -60,8 +60,8 @@ AbstractRemoteLinuxPackageInstaller *UploadAndInstallTarPackageService::packageI } -UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) +UploadAndInstallTarPackageStep::UploadAndInstallTarPackageStep(BuildStepList *bsl, Core::Id id) + : AbstractRemoteLinuxDeployStep(bsl, id) { auto service = createDeployService<UploadAndInstallTarPackageService>(); diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h index d4566470ee..7055d7bbef 100644 --- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h +++ b/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(); diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index 7cd90bac34..6efbd99c03 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -52,8 +52,8 @@ using namespace Utils; namespace WinRt { namespace Internal { -WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl) - : AbstractProcessStep(bsl, Constants::WINRT_BUILD_STEP_DEPLOY) +WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl, Core::Id id) + : AbstractProcessStep(bsl, id) { setDisplayName(tr("Run windeployqt")); diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.h b/src/plugins/winrt/winrtpackagedeploymentstep.h index f8bd0b59f7..fd39ce7ca1 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.h +++ b/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; |