diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index cbadd7e523728fdb26c34fd7369fef1dc0e52ff1..748fcc19d442866f37028407a829c24f2a5a3885 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -182,13 +182,13 @@ bool MakeStep::init() if (!bc) bc = static_cast<CMakeBuildConfiguration *>(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, - 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, + 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); @@ -221,18 +221,6 @@ bool MakeStep::init() void MakeStep::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 view for details."), BuildStep::MessageOutput); - fi.reportResult(false); - emit finished(); - return; - } - AbstractProcessStep::run(fi); } diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h index 980fbab70a82c239ef48479dd897111fe58b63a4..d9dad5277382f023a42a42e686a774b66aab6bb2 100644 --- a/src/plugins/cmakeprojectmanager/makestep.h +++ b/src/plugins/cmakeprojectmanager/makestep.h @@ -112,7 +112,6 @@ private: QString m_ninjaProgressString; QStringList m_buildTargets; QString m_additionalArguments; - QList<ProjectExplorer::Task> m_tasks; bool m_useNinja; CMakeBuildConfiguration *m_activeConfiguration; };