forked from qt-creator/qt-creator
BuildStep: Remove finished() signal and use FutureInterface to report
Remove the finished() signal that is (sometimes) used to report that a buildstep is done and use the FutureInterface for that purpose consistently. Change-Id: Ibe5520b562b91f1a7f4fc73ee898b33b930029ec Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
@@ -171,7 +171,7 @@ bool ConfigureStep::init(QList<const BuildStep *> &earlierSteps)
|
||||
return AbstractProcessStep::init(earlierSteps);
|
||||
}
|
||||
|
||||
void ConfigureStep::run(QFutureInterface<bool>& interface)
|
||||
void ConfigureStep::run(QFutureInterface<bool>& fi)
|
||||
{
|
||||
BuildConfiguration *bc = buildConfiguration();
|
||||
|
||||
@@ -187,13 +187,12 @@ void ConfigureStep::run(QFutureInterface<bool>& interface)
|
||||
|
||||
if (!m_runConfigure) {
|
||||
emit addOutput(tr("Configuration unchanged, skipping configure step."), BuildStep::MessageOutput);
|
||||
interface.reportResult(true);
|
||||
emit finished();
|
||||
reportRunResult(fi, true);
|
||||
return;
|
||||
}
|
||||
|
||||
m_runConfigure = false;
|
||||
AbstractProcessStep::run(interface);
|
||||
AbstractProcessStep::run(fi);
|
||||
}
|
||||
|
||||
BuildStepConfigWidget *ConfigureStep::createConfigWidget()
|
||||
|
||||
Reference in New Issue
Block a user