diff options
author | Daniel Teske <daniel.teske@digia.com> | 2014-04-03 17:02:21 +0200 |
---|---|---|
committer | Daniel Teske <daniel.teske@digia.com> | 2014-04-04 12:03:55 +0200 |
commit | efecd15b1e8e325fd26abfa3e03f3d64437cc6c1 (patch) | |
tree | 2bc40456aa822ee1952526287cf846a2f491d964 /src/plugins/autotoolsprojectmanager/makestep.cpp | |
parent | 11d238649d65dd9df14d0dec792a0a192ec4f1c1 (diff) |
BuildSteps: emitting tasks from init() works fine
Change-Id: Ida5c7e9eea197d12ebe6e4bd86e90b2ef7e7a100
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/autotoolsprojectmanager/makestep.cpp')
-rw-r--r-- | src/plugins/autotoolsprojectmanager/makestep.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index 585e406c80..f9384bda2b 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -165,13 +165,13 @@ bool MakeStep::init() if (!bc) bc = target()->activeBuildConfiguration(); - m_tasks.clear(); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); if (!tc) { - m_tasks.append(Task(Task::Error, tr("Qt Creator needs a compiler set up to build. Configure a compiler in the kit options."), - Utils::FileName(), -1, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); - return true; // otherwise the tasks will not get reported + emit addTask(Task(Task::Error, tr("Qt Creator needs a compiler set up to build. Configure a compiler in the kit options."), + Utils::FileName(), -1, + Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM))); + emit addOutput(tr("Configuration is faulty. Check the Issues view for details."), BuildStep::MessageOutput); + return false; } QString arguments = Utils::QtcProcess::joinArgs(m_buildTargets); @@ -202,19 +202,6 @@ bool MakeStep::init() void MakeStep::run(QFutureInterface<bool> &interface) { - // Warn on common error conditions: - bool canContinue = true; - foreach (const Task &t, m_tasks) { - addTask(t); - canContinue = false; - } - if (!canContinue) { - emit addOutput(tr("Configuration is faulty. Check the Issues view for details."), BuildStep::MessageOutput); - interface.reportResult(false); - emit finished(); - return; - } - AbstractProcessStep::run(interface); } |