From 11d238649d65dd9df14d0dec792a0a192ec4f1c1 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 3 Apr 2014 15:37:02 +0200
Subject: [PATCH] CMake: MakeStep: Simplfy code

Change-Id: I4de1ceecc1f0602d0c58ee3e411d43b15437dffb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/cmakeprojectmanager/makestep.cpp | 22 +++++---------------
 src/plugins/cmakeprojectmanager/makestep.h   |  1 -
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index cbadd7e5237..748fcc19d44 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 980fbab70a8..d9dad527738 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;
 };