aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/genericprojectmanager/genericmakestep.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2014-06-20 14:32:40 +0200
committerTobias Hunger <tobias.hunger@digia.com>2014-06-23 15:04:04 +0200
commit4eb2908c44033f884b82560360440ebb3269af63 (patch)
tree673f05b88cd32da803724d95bb8f7aec0af3badf /src/plugins/genericprojectmanager/genericmakestep.cpp
parent43735f28dd5e72e461f854faa6bb9ad1ae033698 (diff)
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>
Diffstat (limited to 'src/plugins/genericprojectmanager/genericmakestep.cpp')
-rw-r--r--src/plugins/genericprojectmanager/genericmakestep.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index 77171b2676..0f5c5f9982 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -103,13 +103,15 @@ bool GenericMakeStep::init()
BuildConfiguration *bc = buildConfiguration();
if (!bc)
bc = 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;
}