feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix creator not showing warnings when building with missing tool chains

Browse Source 
Change-Id: I1e058a42f2bb0b0df00e403aae5d9cc47e960076
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Tobias Hunger
2012-08-10 14:13:55 +02:00
committed by Eike Ziller
parent 3c5f2aae48
commit af63967d29
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qt4projectmanager/makestep.cpp
View File

@@ -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);
}