Unify "missing compiler" and "missing build configuration" tasks

Everybody used to do their own thing...

Also unify the "Configuration is faulty" message we write into the
Application output window.

Change-Id: I0e5c4ec68155d66aa1d0ea53134b98917869e5c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

2 files changed, 8 insertions, 6 deletions

diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp
index 4af4ecd79f..14923acf33 100644
--- a/src/plugins/qmakeprojectmanager/makestep.cpp
+++ b/src/plugins/qmakeprojectmanager/makestep.cpp
@@ -157,13 +157,15 @@ bool MakeStep::init()
     QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
     if (!bc)
         bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
+    if (!bc)
+        emit addTask(Task::buildConfigurationMissingTask());
 
     ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
-    if (!tc) {
-        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);
+    if (!tc)
+        emit addTask(Task::compilerMissingTask());
+
+    if (!bc || !tc) {
+        emitFaultyConfigurationMessage();
         return false;
     }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index aaefe22e8a..bb1e173bd5 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -286,7 +286,7 @@ bool QMakeStep::init()
                 canContinue = false;
         }
         if (!canContinue) {
-            emit addOutput(tr("Configuration is faulty, please check the Issues view for details."), BuildStep::MessageOutput);
+            emitFaultyConfigurationMessage();
             return false;
         }
     }