Commit c07a6118 authored by Tobias Hunger's avatar Tobias Hunger

Fix build no longer failing on broken ABLD builds (Symbian)

 * Make the behaviour less implicit while doing this: Hopefully
   that will stop it from getting broken again.
parent c82bfad2
......@@ -173,13 +173,16 @@ bool MakeStep::init()
setEnabled(true);
setArguments(args);
m_gnuMakeParser = 0;
if (bc->qtVersion()->supportsTargetId(Qt4ProjectManager::Constants::S60_DEVICE_TARGET_ID) ||
bc->qtVersion()->supportsTargetId(Qt4ProjectManager::Constants::S60_EMULATOR_TARGET_ID)) {
if (bc->qtVersion()->isBuildWithSymbianSbsV2()) {
setOutputParser(new SbsV2Parser);
} else {
setOutputParser(new AbldParser);
appendOutputParser(new ProjectExplorer::GnuMakeParser(workingDirectory));
m_gnuMakeParser = new ProjectExplorer::GnuMakeParser(workingDirectory);
appendOutputParser(m_gnuMakeParser);
}
} else {
setOutputParser(new ProjectExplorer::GnuMakeParser(workingDirectory));
......@@ -205,9 +208,8 @@ void MakeStep::run(QFutureInterface<bool> & fi)
bool MakeStep::processSucceeded(int exitCode, QProcess::ExitStatus status)
{
// Symbian does retun 0, even on failed makes! So we check for fatal make errors here.
ProjectExplorer::GnuMakeParser *parser = qobject_cast<ProjectExplorer::GnuMakeParser *>(outputParser());
if (parser && parser->fatalErrors() != 0)
return false;
if (m_gnuMakeParser)
return m_gnuMakeParser->fatalErrors() == 0;
return AbstractProcessStep::processSucceeded(exitCode, status);
}
......
......@@ -41,6 +41,7 @@ QT_END_NAMESPACE
namespace ProjectExplorer {
class BuildStep;
class GnuMakeParser;
class IBuildStepFactory;
class Project;
}
......@@ -109,6 +110,7 @@ private:
bool m_clean;
QStringList m_userArgs;
QString m_makeCmd;
ProjectExplorer::GnuMakeParser * m_gnuMakeParser;
};
class MakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
......
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