diff options
54 files changed, 82 insertions, 70 deletions
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 9db178b098..9d0cfc2fc7 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -97,7 +97,7 @@ AndroidBuildApkStep::AndroidBuildApkStep(ProjectExplorer::BuildStepList *parent, } } -bool AndroidBuildApkStep::init() +bool AndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) { ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); @@ -132,7 +132,7 @@ bool AndroidBuildApkStep::init() m_openPackageLocationForRun = m_openPackageLocation; m_apkPath = AndroidManager::androidQtSupport(target())->apkPath(target()).toString(); - bool result = AbstractProcessStep::init(); + bool result = AbstractProcessStep::init(earlierSteps); if (!result) return false; diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h index 54fecedf8d..b0de45fc45 100644 --- a/src/plugins/android/androidbuildapkstep.h +++ b/src/plugins/android/androidbuildapkstep.h @@ -97,7 +97,7 @@ protected: bool keystorePassword(); bool certificatePassword(); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override { return true; } void processFinished(int exitCode, QProcess::ExitStatus status) override; diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index e8e567dbc2..03a2318caf 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -166,8 +166,9 @@ void AndroidDeployQtStep::ctor() this, &AndroidDeployQtStep::slotSetSerialNumber); } -bool AndroidDeployQtStep::init() +bool AndroidDeployQtStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); m_androiddeployqtArgs.clear(); if (AndroidManager::checkForQt51Files(project()->projectDirectory())) diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index c09cf06f52..009b4d5838 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -103,7 +103,7 @@ private: void ctor(); void runCommand(const QString &program, const QStringList &arguments); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; enum DeployResult { Success, Failure, AskUinstall }; DeployResult runDeploy(QFutureInterface<bool> &fi); diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.cpp b/src/plugins/autotoolsprojectmanager/autogenstep.cpp index a00482cecf..c1ae56310f 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autogenstep.cpp @@ -152,7 +152,7 @@ void AutogenStep::ctor() setDefaultDisplayName(tr("Autogen")); } -bool AutogenStep::init() +bool AutogenStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); @@ -165,7 +165,7 @@ bool AutogenStep::init() pp->setArguments(additionalArguments()); pp->resolveAll(); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void AutogenStep::run(QFutureInterface<bool> &interface) diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h index 2ac9ed39fe..6415f8ed06 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.h +++ b/src/plugins/autotoolsprojectmanager/autogenstep.h @@ -96,7 +96,7 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep public: explicit AutogenStep(ProjectExplorer::BuildStepList *bsl); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &interface) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override; diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp index 141e095fdb..0967bdcc15 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.cpp @@ -151,7 +151,7 @@ void AutoreconfStep::ctor() setDefaultDisplayName(tr("Autoreconf")); } -bool AutoreconfStep::init() +bool AutoreconfStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); @@ -164,7 +164,7 @@ bool AutoreconfStep::init() pp->setArguments(additionalArguments()); pp->resolveAll(); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void AutoreconfStep::run(QFutureInterface<bool> &interface) diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h index 425f55ff54..453786852f 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h @@ -96,7 +96,7 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep public: explicit AutoreconfStep(ProjectExplorer::BuildStepList *bsl); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &interface) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override; diff --git a/src/plugins/autotoolsprojectmanager/configurestep.cpp b/src/plugins/autotoolsprojectmanager/configurestep.cpp index ba65c6b896..4d641d952d 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.cpp +++ b/src/plugins/autotoolsprojectmanager/configurestep.cpp @@ -166,7 +166,7 @@ void ConfigureStep::ctor() setDefaultDisplayName(tr("Configure")); } -bool ConfigureStep::init() +bool ConfigureStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); @@ -178,7 +178,7 @@ bool ConfigureStep::init() pp->setArguments(additionalArguments()); pp->resolveAll(); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void ConfigureStep::run(QFutureInterface<bool>& interface) diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h index ec3661899b..2626e06307 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.h +++ b/src/plugins/autotoolsprojectmanager/configurestep.h @@ -95,7 +95,7 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep public: explicit ConfigureStep(ProjectExplorer::BuildStepList *bsl); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &interface) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override; diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index b0a66cd7bf..6a7111f2f3 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -160,7 +160,7 @@ void MakeStep::setClean(bool clean) m_clean = clean; } -bool MakeStep::init() +bool MakeStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); if (!bc) @@ -200,7 +200,7 @@ bool MakeStep::init() appendOutputParser(parser); outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory()); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void MakeStep::run(QFutureInterface<bool> &interface) diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h index 87af2e23a5..384b424972 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.h +++ b/src/plugins/autotoolsprojectmanager/makestep.h @@ -94,7 +94,7 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep public: explicit MakeStep(ProjectExplorer::BuildStepList *bsl); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &interface) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; void setClean(bool clean); diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp index 6bcb3ff7d5..a16825ea46 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp @@ -132,8 +132,9 @@ QString BareMetalGdbCommandsDeployStep::gdbCommands() const return m_gdbCommands; } -bool BareMetalGdbCommandsDeployStep::init() +bool BareMetalGdbCommandsDeployStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); return true; } diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h index 77ebc4eb61..d8d604ec9f 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h @@ -48,7 +48,7 @@ public: BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, BareMetalGdbCommandsDeployStep *other); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; bool runInGuiThread() const override { return true;} diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index 8196659496..4d67da3353 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -174,7 +174,7 @@ bool MakeStep::fromMap(const QVariantMap &map) } -bool MakeStep::init() +bool MakeStep::init(QList<const BuildStep *> &earlierSteps) { CMakeBuildConfiguration *bc = cmakeBuildConfiguration(); if (!bc) @@ -219,7 +219,7 @@ bool MakeStep::init() appendOutputParser(parser); outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory()); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void MakeStep::run(QFutureInterface<bool> &fi) diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h index 06efaecb1d..0e1e4c0eef 100644 --- a/src/plugins/cmakeprojectmanager/makestep.h +++ b/src/plugins/cmakeprojectmanager/makestep.h @@ -59,7 +59,7 @@ public: CMakeBuildConfiguration *cmakeBuildConfiguration() const; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp index a96a9face8..100c6328a7 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.cpp +++ b/src/plugins/genericprojectmanager/genericmakestep.cpp @@ -94,7 +94,7 @@ void GenericMakeStep::ctor() GENERIC_MS_DISPLAY_NAME)); } -bool GenericMakeStep::init() +bool GenericMakeStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); if (!bc) @@ -134,7 +134,7 @@ bool GenericMakeStep::init() appendOutputParser(parser); outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory()); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void GenericMakeStep::setClean(bool clean) diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index e3912a625c..6d7ba70170 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -54,7 +54,7 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep public: explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index 388d134587..c508beda39 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -95,7 +95,7 @@ void IosBuildStep::ctor() IOS_BUILD_STEP_DISPLAY_NAME)); } -bool IosBuildStep::init() +bool IosBuildStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); if (!bc) @@ -135,7 +135,7 @@ bool IosBuildStep::init() appendOutputParser(parser); outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory()); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void IosBuildStep::setClean(bool clean) diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index 9a12c7525d..60105e8e5c 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/src/plugins/ios/iosbuildstep.h @@ -53,7 +53,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep public: explicit IosBuildStep(ProjectExplorer::BuildStepList *parent); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 3ac913091b..e12025f6b1 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -97,8 +97,9 @@ void IosDeployStep::updateDisplayNames() setDisplayName(tr("Deploy to %1").arg(devName)); } -bool IosDeployStep::init() +bool IosDeployStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); QTC_ASSERT(m_transferStatus == NoTransfer, return false); m_device = DeviceKitInformation::device(target()->kit()); IosRunConfiguration * runConfig = qobject_cast<IosRunConfiguration *>( diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index a229fc48be..3b026c36dc 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/src/plugins/ios/iosdeploystep.h @@ -88,7 +88,7 @@ private slots: private: IosDeployStep(ProjectExplorer::BuildStepList *bc, IosDeployStep *other); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override { return true; } bool runInGuiThread() const override { return true; } diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp index d6088e30ad..3f68314a2a 100644 --- a/src/plugins/ios/iosdsymbuildstep.cpp +++ b/src/plugins/ios/iosdsymbuildstep.cpp @@ -84,7 +84,7 @@ bool IosPresetBuildStep::completeSetupWithStep(BuildStep *bs) return true; } -bool IosPresetBuildStep::init() +bool IosPresetBuildStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); if (!bc) @@ -111,7 +111,7 @@ bool IosPresetBuildStep::init() if (outputParser()) outputParser()->setWorkingDirectory(pp->effectiveWorkingDirectory()); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } QVariantMap IosPresetBuildStep::toMap() const diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index b41cfd836a..9ca826fe02 100644 --- a/src/plugins/ios/iosdsymbuildstep.h +++ b/src/plugins/ios/iosdsymbuildstep.h @@ -47,7 +47,7 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep friend class IosPresetBuildStepFactory; public: - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index 29b5e90184..8fc5315274 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -178,8 +178,9 @@ void AbstractProcessStep::setIgnoreReturnValue(bool b) YourBuildStep::init(). */ -bool AbstractProcessStep::init() +bool AbstractProcessStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); return true; } diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index c329c6892b..b086545f67 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -54,7 +54,7 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep public: ~AbstractProcessStep() override; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &) override; bool runInGuiThread() const override { return true; } diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 4d8db4520f..0e363beb0a 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -491,6 +491,7 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps, QStringList names, addToOutputWindow(str, BuildStep::MessageOutput, BuildStep::DontAppendNewline); } + QList<const BuildStep *> earlierSteps; int count = steps.size(); bool init = true; int i = 0; @@ -501,9 +502,10 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps, QStringList names, connect(bs, SIGNAL(addOutput(QString,ProjectExplorer::BuildStep::OutputFormat,ProjectExplorer::BuildStep::OutputNewlineSetting)), m_instance, SLOT(addToOutputWindow(QString,ProjectExplorer::BuildStep::OutputFormat,ProjectExplorer::BuildStep::OutputNewlineSetting))); if (bs->enabled()) { - init = bs->init(); + init = bs->init(earlierSteps); if (!init) break; + earlierSteps.append(bs); } } if (!init) { diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index 43ae9aef02..a2f065da6f 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -56,7 +56,7 @@ protected: BuildStep(BuildStepList *bsl, BuildStep *bs); public: - virtual bool init() = 0; + virtual bool init(QList<const BuildStep *> &earlierSteps) = 0; virtual void run(QFutureInterface<bool> &fi) = 0; diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp index 0cc4320789..3e8f558cad 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp @@ -54,8 +54,9 @@ DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, DeviceCheckBuildS setDefaultDisplayName(stepDisplayName()); } -bool DeviceCheckBuildStep::init() +bool DeviceCheckBuildStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); IDevice::ConstPtr device = DeviceKitInformation::device(target()->kit()); if (!device) { Core::Id deviceTypeId = DeviceTypeKitInformation::deviceTypeId(target()->kit()); diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h index 5c4617735d..d50cd73cb4 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h @@ -47,7 +47,7 @@ public: DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id); DeviceCheckBuildStep(BuildStepList *bsl, DeviceCheckBuildStep *bs); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index 8d20363c7c..707fc66c53 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -72,7 +72,7 @@ void ProcessStep::ctor() m_workingDirectory = QLatin1String(Constants::DEFAULT_WORKING_DIR); } -bool ProcessStep::init() +bool ProcessStep::init(QList<const BuildStep *> &earlierSteps) { BuildConfiguration *bc = buildConfiguration(); if (!bc) @@ -86,7 +86,7 @@ bool ProcessStep::init() pp->resolveAll(); setOutputParser(target()->kit()->createOutputParser()); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void ProcessStep::run(QFutureInterface<bool> & fi) diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 9360fa921f..61a0462141 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -65,7 +65,7 @@ class ProcessStep : public AbstractProcessStep public: explicit ProcessStep(BuildStepList *bsl); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &) override; BuildStepConfigWidget *createConfigWidget() override; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 95c60da7fd..16273afac2 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -95,8 +95,9 @@ QbsBuildStep::~QbsBuildStep() delete m_parser; } -bool QbsBuildStep::init() +bool QbsBuildStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); if (static_cast<QbsProject *>(project())->isParsing() || m_job) return false; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index 1d06e91c17..e795b6e57c 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -55,7 +55,7 @@ public: QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildStep *other); ~QbsBuildStep() override; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp index 0d4a46d479..3a86fccbc6 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp +++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp @@ -80,8 +80,9 @@ QbsCleanStep::~QbsCleanStep() } } -bool QbsCleanStep::init() +bool QbsCleanStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); if (static_cast<QbsProject *>(project())->isParsing() || m_job) return false; diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 9f8ba25c45..e2f385978e 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -52,7 +52,7 @@ public: QbsCleanStep(ProjectExplorer::BuildStepList *bsl, const QbsCleanStep *other); ~QbsCleanStep() override; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp index af75f03e57..51252e3ecc 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp @@ -83,8 +83,9 @@ QbsInstallStep::~QbsInstallStep() m_job = 0; } -bool QbsInstallStep::init() +bool QbsInstallStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); QTC_ASSERT(!static_cast<QbsProject *>(project())->isParsing() && !m_job, return false); return true; } diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index c43a030e7f..a7ede3339c 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h @@ -52,7 +52,7 @@ public: QbsInstallStep(ProjectExplorer::BuildStepList *bsl, const QbsInstallStep *other); ~QbsInstallStep() override; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp index 04bdf30967..7b5018741a 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp @@ -60,7 +60,7 @@ AndroidPackageInstallationStep::AndroidPackageInstallationStep(ProjectExplorer:: : AbstractProcessStep(bc, other) { } -bool AndroidPackageInstallationStep::init() +bool AndroidPackageInstallationStep::init(QList<const BuildStep *> &earlierSteps) { ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); QString dirPath = bc->buildDirectory().appendPath(QLatin1String(Android::Constants::ANDROID_BUILDDIRECTORY)).toString(); @@ -100,7 +100,7 @@ bool AndroidPackageInstallationStep::init() m_androidDirsToClean << dirPath; } - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void AndroidPackageInstallationStep::run(QFutureInterface<bool> &fi) diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h index b1157666ea..019756a762 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h @@ -44,7 +44,7 @@ class AndroidPackageInstallationStep : public ProjectExplorer::AbstractProcessSt public: explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override; diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index 96d16bc5a3..7c18c4d235 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -168,12 +168,12 @@ void QmakeAndroidBuildApkStep::ctor() { } -bool QmakeAndroidBuildApkStep::init() +bool QmakeAndroidBuildApkStep::init(QList<const BuildStep *> &earlierSteps) { if (AndroidManager::checkForQt51Files(project()->projectDirectory())) emit addOutput(tr("Found old folder \"android\" in source directory. Qt 5.2 does not use that folder by default."), ErrorOutput); - if (!AndroidBuildApkStep::init()) + if (!AndroidBuildApkStep::init(earlierSteps)) return false; QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(target()->kit()); diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h index b3e3115646..553e894a50 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h @@ -77,7 +77,7 @@ protected: protected: void ctor(); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; void processStarted() override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index 58aff22a63..f36d9d0bbf 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -147,7 +147,7 @@ bool MakeStep::fromMap(const QVariantMap &map) return AbstractProcessStep::fromMap(map); } -bool MakeStep::init() +bool MakeStep::init(QList<const BuildStep *> &earlierSteps) { QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); if (!bc) @@ -266,7 +266,7 @@ bool MakeStep::init() m_scriptTarget = (static_cast<QmakeProject *>(bc->target()->project())->rootQmakeProjectNode()->projectType() == ScriptTemplate); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void MakeStep::run(QFutureInterface<bool> & fi) diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h index 8e60a0c4c1..1f51860e75 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/makestep.h @@ -83,7 +83,7 @@ public: QmakeBuildConfiguration *qmakeBuildConfiguration() const; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 9a556c244a..a11657c92f 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -180,7 +180,7 @@ QMakeStepConfig QMakeStep::deducedArguments() } -bool QMakeStep::init() +bool QMakeStep::init(QList<const BuildStep *> &earlierSteps) { QmakeBuildConfiguration *qt4bc = qmakeBuildConfiguration(); const QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(target()->kit()); @@ -251,7 +251,7 @@ bool QMakeStep::init() m_scriptTemplate = node->projectType() == ScriptTemplate; - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void QMakeStep::run(QFutureInterface<bool> &fi) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index bf014f2a67..cf0753056b 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -131,7 +131,7 @@ public: explicit QMakeStep(ProjectExplorer::BuildStepList *parent); QmakeBuildConfiguration *qmakeBuildConfiguration() const; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &) override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; bool immutable() const override; diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp index c4babae829..77218c0837 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.cpp +++ b/src/plugins/remotelinux/abstractpackagingstep.cpp @@ -139,8 +139,9 @@ bool AbstractPackagingStep::isPackagingNeeded() const return false; } -bool AbstractPackagingStep::init() +bool AbstractPackagingStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); d->cachedPackageDirectory = packageDirectory(); d->cachedPackageFilePath = packageFilePath(); return true; diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h index 5767cb4f01..8c76e147d5 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.h +++ b/src/plugins/remotelinux/abstractpackagingstep.h @@ -50,7 +50,7 @@ public: QString packageFilePath() const; QString cachedPackageFilePath() const; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; signals: void packageFilePathChanged(); diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index c1f4d03e13..4e6166aa8c 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -79,8 +79,9 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const return BuildStep::toMap().unite(deployService()->exportDeployTimes()); } -bool AbstractRemoteLinuxDeployStep::init() +bool AbstractRemoteLinuxDeployStep::init(QList<const BuildStep *> &earlierSteps) { + Q_UNUSED(earlierSteps); QString error; deployService()->setTarget(target()); const bool canDeploy = initInternal(&error); diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index 1051982698..a40841553f 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -50,7 +50,7 @@ public: ~AbstractRemoteLinuxDeployStep() override; bool fromMap(const QVariantMap &map) override; QVariantMap toMap() const override; - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; bool runInGuiThread() const override { return true; } void cancel() override; diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index 702a19c395..bf1eebb24f 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -130,9 +130,9 @@ void TarPackageCreationStep::ctor() m_ignoreMissingFiles = false; } -bool TarPackageCreationStep::init() +bool TarPackageCreationStep::init(QList<const BuildStep *> &earlierSteps) { - if (!AbstractPackagingStep::init()) + if (!AbstractPackagingStep::init(earlierSteps)) return false; m_packagingNeeded = isPackagingNeeded(); if (m_packagingNeeded) diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h index 4bfa3a3d77..314d8eb84e 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.h +++ b/src/plugins/remotelinux/tarpackagecreationstep.h @@ -52,7 +52,7 @@ public: static Core::Id stepId(); static QString displayName(); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; void setIgnoreMissingFiles(bool ignoreMissingFiles); diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index c93adbe80e..b1defa07b6 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -61,7 +61,7 @@ WinRtPackageDeploymentStep::WinRtPackageDeploymentStep(BuildStepList *bsl) m_args = defaultWinDeployQtArguments(); } -bool WinRtPackageDeploymentStep::init() +bool WinRtPackageDeploymentStep::init(QList<const BuildStep *> &earlierSteps) { WinRtRunConfiguration *rc = qobject_cast<WinRtRunConfiguration *>( target()->activeRunConfiguration()); @@ -108,7 +108,7 @@ bool WinRtPackageDeploymentStep::init() params->setArguments(args); params->setEnvironment(target()->activeBuildConfiguration()->environment()); - return AbstractProcessStep::init(); + return AbstractProcessStep::init(earlierSteps); } void WinRtPackageDeploymentStep::run(QFutureInterface<bool> &fi) diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.h b/src/plugins/winrt/winrtpackagedeploymentstep.h index bbbd93ad10..8877bfecc2 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.h +++ b/src/plugins/winrt/winrtpackagedeploymentstep.h @@ -41,7 +41,7 @@ class WinRtPackageDeploymentStep : public ProjectExplorer::AbstractProcessStep Q_OBJECT public: explicit WinRtPackageDeploymentStep(ProjectExplorer::BuildStepList *bsl); - bool init() override; + bool init(QList<const BuildStep *> &earlierSteps) override; void run(QFutureInterface<bool> &fi) override; bool processSucceeded(int exitCode, QProcess::ExitStatus status) override; void stdOutput(const QString &line) override; |