forked from qt-creator/qt-creator
OutputParser: Parsers with fatal errors will now cause failure for all steps
Remove handling of parsers reporting fatal errors from the qmake based makestep and add it to abstractprocessstep instead. This makes the osparser work with all build systems. Change-Id: I1044d0e6002d2157946e0342fe060991ffe37ffa Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
@@ -298,6 +298,9 @@ void AbstractProcessStep::processStartupFailed()
|
|||||||
|
|
||||||
bool AbstractProcessStep::processSucceeded(int exitCode, QProcess::ExitStatus status)
|
bool AbstractProcessStep::processSucceeded(int exitCode, QProcess::ExitStatus status)
|
||||||
{
|
{
|
||||||
|
if (outputParser() && outputParser()->hasFatalErrors())
|
||||||
|
return false;
|
||||||
|
|
||||||
return exitCode == 0 && status == QProcess::NormalExit;
|
return exitCode == 0 && status == QProcess::NormalExit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -298,15 +298,6 @@ void MakeStep::run(QFutureInterface<bool> & fi)
|
|||||||
AbstractProcessStep::run(fi);
|
AbstractProcessStep::run(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.
|
|
||||||
if (outputParser() && outputParser()->hasFatalErrors())
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return AbstractProcessStep::processSucceeded(exitCode, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool MakeStep::immutable() const
|
bool MakeStep::immutable() const
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ public:
|
|||||||
|
|
||||||
virtual bool init();
|
virtual bool init();
|
||||||
virtual void run(QFutureInterface<bool> &);
|
virtual void run(QFutureInterface<bool> &);
|
||||||
bool processSucceeded(int exitCode, QProcess::ExitStatus status);
|
|
||||||
|
|
||||||
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
|
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
|
||||||
virtual bool immutable() const;
|
virtual bool immutable() const;
|
||||||
|
|||||||
Reference in New Issue
Block a user