feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BuildManager: Provide context of earlier build steps to init

Browse Source 
This information can be used to get information from earlier steps,
which e.g. queried for android devices to deploy to.

Change-Id: Iefe1c9443915cb6211f86f98ff7aaf3cb75145ba
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-13 12:19:35 +01:00
parent cedf015c10
commit 79f82d0d0a
54 changed files with 82 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -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;

2
src/plugins/android/androidbuildapkstep.h
View File

@@ -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;

3
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -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()))

2
src/plugins/android/androiddeployqtstep.h
View File

@@ -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);

4
src/plugins/autotoolsprojectmanager/autogenstep.cpp
View File

@@ -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)

2
src/plugins/autotoolsprojectmanager/autogenstep.h
View File

@@ -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;

4
src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
View File

@@ -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)

2
src/plugins/autotoolsprojectmanager/autoreconfstep.h
View File

@@ -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;

4
src/plugins/autotoolsprojectmanager/configurestep.cpp
View File

@@ -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)

2
src/plugins/autotoolsprojectmanager/configurestep.h
View File

@@ -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;

4
src/plugins/autotoolsprojectmanager/makestep.cpp
View File

@@ -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)

2
src/plugins/autotoolsprojectmanager/makestep.h
View File

@@ -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);

3
src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp
View File

@@ -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;
}

2
src/plugins/baremetal/baremetalgdbcommandsdeploystep.h
View File

@@ -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;}

4
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -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)

2
src/plugins/cmakeprojectmanager/makestep.h
View File

@@ -59,7 +59,7 @@ public:
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
bool init() override;
bool init(QList<const BuildStep *> &earlierSteps) override;
void run(QFutureInterface<bool> &fi) override;

4
src/plugins/genericprojectmanager/genericmakestep.cpp
View File

@@ -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)

2
src/plugins/genericprojectmanager/genericmakestep.h
View File

@@ -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;

4
src/plugins/ios/iosbuildstep.cpp
View File

@@ -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)

2
src/plugins/ios/iosbuildstep.h
View File

@@ -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;

3
src/plugins/ios/iosdeploystep.cpp
View File

@@ -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 *>(

2
src/plugins/ios/iosdeploystep.h
View File

@@ -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; }

4
src/plugins/ios/iosdsymbuildstep.cpp
View File

@@ -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

2
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -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;

3
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -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;
}

2
src/plugins/projectexplorer/abstractprocessstep.h
View File

@@ -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; }

4
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -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) {

2
src/plugins/projectexplorer/buildstep.h
View File

@@ -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;

3
src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp
View File

@@ -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());

2
src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
View File

@@ -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;

4
src/plugins/projectexplorer/processstep.cpp
View File

@@ -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)

2
src/plugins/projectexplorer/processstep.h
View File

@@ -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;

3
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -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;

2
src/plugins/qbsprojectmanager/qbsbuildstep.h
View File

@@ -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;

3
src/plugins/qbsprojectmanager/qbscleanstep.cpp
View File

@@ -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;

2
src/plugins/qbsprojectmanager/qbscleanstep.h
View File

@@ -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;

3
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -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;
}

2
src/plugins/qbsprojectmanager/qbsinstallstep.h
View File

@@ -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;

4
src/plugins/qmakeandroidsupport/androidpackageinstallationstep.cpp
View File

@@ -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)

2
src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
View File

@@ -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;

4
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp
View File

@@ -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());

2
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
View File

@@ -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;

4
src/plugins/qmakeprojectmanager/makestep.cpp
View File

@@ -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)

2
src/plugins/qmakeprojectmanager/makestep.h
View File

@@ -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;

4
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -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)

2
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -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;

3
src/plugins/remotelinux/abstractpackagingstep.cpp
View File

@@ -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;

2
src/plugins/remotelinux/abstractpackagingstep.h
View File

@@ -50,7 +50,7 @@ public:
QString packageFilePath() const;
QString cachedPackageFilePath() const;
bool init() override;
bool init(QList<const BuildStep *> &earlierSteps) override;
signals:
void packageFilePathChanged();

3
src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
View File

@@ -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);

2
src/plugins/remotelinux/abstractremotelinuxdeploystep.h
View File

@@ -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;

4
src/plugins/remotelinux/tarpackagecreationstep.cpp
View File

@@ -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)

2
src/plugins/remotelinux/tarpackagecreationstep.h
View File

@@ -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);

4
src/plugins/winrt/winrtpackagedeploymentstep.cpp
View File

@@ -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)

2
src/plugins/winrt/winrtpackagedeploymentstep.h
View File

@@ -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;