BuildSteps: emitting tasks from init() works fine

Change-Id: Ida5c7e9eea197d12ebe6e4bd86e90b2ef7e7a100
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2014-04-03 17:02:21 +02:00
parent 11d238649d
commit efecd15b1e
10 changed files with 30 additions and 86 deletions

View File

@@ -111,14 +111,14 @@ bool IosBuildStep::init()
if (!bc)
bc = target()->activeBuildConfiguration();
m_tasks.clear();
ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
if (!tc) {
Task t = Task(Task::Error, tr("Qt Creator needs a compiler set up to build. Configure a compiler in the kit preferences."),
Utils::FileName(), -1,
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
m_tasks.append(t);
emit addTask(t);
emit addOutput(tr("Configuration is faulty. Check the Issues output pane for details."),
BuildStep::MessageOutput);
return false;
}
ProcessParameters *pp = processParameters();
@@ -217,19 +217,6 @@ QString IosBuildStep::buildCommand() const
void IosBuildStep::run(QFutureInterface<bool> &fi)
{
bool canContinue = true;
foreach (const Task &t, m_tasks) {
addTask(t);
canContinue = false;
}
if (!canContinue) {
emit addOutput(tr("Configuration is faulty. Check the Issues output pane for details."),
BuildStep::MessageOutput);
fi.reportResult(false);
emit finished();
return;
}
AbstractProcessStep::run(fi);
}

View File

@@ -83,7 +83,6 @@ private:
QString m_buildCommand;
bool m_useDefaultArguments;
bool m_clean;
QList<ProjectExplorer::Task> m_tasks;
};
class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget