Commit af63967d authored by Tobias Hunger's avatar Tobias Hunger Committed by Eike Ziller
Browse files

Fix creator not showing warnings when building with missing tool chains



Change-Id: I1e058a42f2bb0b0df00e403aae5d9cc47e960076
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent 3c5f2aae
......@@ -148,7 +148,7 @@ bool MakeStep::init()
m_tasks.append(Task(Task::Error, tr("Qt Creator needs a build configuration set up to build. Configure a tool chain in Project mode."),
Utils::FileName(), -1,
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return false;
return true; // otherwise the tasks will not get reported
}
ToolChain *tc = ToolChainProfileInformation::toolChain(target()->profile());
......@@ -156,7 +156,7 @@ bool MakeStep::init()
m_tasks.append(Task(Task::Error, tr("Qt Creator needs a tool chain set up to build. Configure a tool chain in the target options."),
Utils::FileName(), -1,
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return false;
return true; // otherwise the tasks will not get reported
}
ProcessParameters *pp = processParameters();
......@@ -278,18 +278,6 @@ bool MakeStep::init()
void MakeStep::run(QFutureInterface<bool> & fi)
{
if (m_scriptTarget) {
fi.reportResult(true);
return;
}
if (!QFileInfo(m_makeFileToCheck).exists()) {
if (!ignoreReturnValue())
emit addOutput(tr("Cannot find Makefile. Check your build settings."), BuildStep::MessageOutput);
fi.reportResult(ignoreReturnValue());
return;
}
// Warn on common error conditions:
bool canContinue = true;
foreach (const Task &t, m_tasks) {
......@@ -303,6 +291,18 @@ void MakeStep::run(QFutureInterface<bool> & fi)
return;
}
if (m_scriptTarget) {
fi.reportResult(true);
return;
}
if (!QFileInfo(m_makeFileToCheck).exists()) {
if (!ignoreReturnValue())
emit addOutput(tr("Cannot find Makefile. Check your build settings."), BuildStep::MessageOutput);
fi.reportResult(ignoreReturnValue());
return;
}
AbstractProcessStep::run(fi);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment