BuildManager: Provide context of earlier build steps to init

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

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;

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;

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

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