Commit 3ec173bf authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Qt4: Simplify makestep

 * Remove unnecessary member variable.
parent 88b77ba8
...@@ -180,14 +180,15 @@ bool MakeStep::init() ...@@ -180,14 +180,15 @@ bool MakeStep::init()
setEnabled(true); setEnabled(true);
pp->setArguments(args); pp->setArguments(args);
m_makeParser = bc->qtVersion()->createOutputParser(); ProjectExplorer::IOutputParser *parser = bc->qtVersion()->createOutputParser();
m_makeParser->appendOutputParser(new QtParser); Q_ASSERT(parser);
parser->appendOutputParser(new QtParser);
if (toolchain) if (toolchain)
m_makeParser->appendOutputParser(toolchain->outputParser()); parser->appendOutputParser(toolchain->outputParser());
m_makeParser->setWorkingDirectory(workingDirectory); parser->setWorkingDirectory(workingDirectory);
setOutputParser(m_makeParser); setOutputParser(parser);
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }
...@@ -205,7 +206,7 @@ void MakeStep::run(QFutureInterface<bool> & fi) ...@@ -205,7 +206,7 @@ void MakeStep::run(QFutureInterface<bool> & fi)
bool MakeStep::processSucceeded(int exitCode, QProcess::ExitStatus status) bool MakeStep::processSucceeded(int exitCode, QProcess::ExitStatus status)
{ {
// Symbian does retun 0, even on failed makes! So we check for fatal make errors here. // Symbian does retun 0, even on failed makes! So we check for fatal make errors here.
if (m_makeParser && m_makeParser->hasFatalErrors()) if (outputParser() && outputParser()->hasFatalErrors())
return false; return false;
return AbstractProcessStep::processSucceeded(exitCode, status); return AbstractProcessStep::processSucceeded(exitCode, status);
......
...@@ -111,7 +111,6 @@ private: ...@@ -111,7 +111,6 @@ private:
bool m_clean; bool m_clean;
QString m_userArgs; QString m_userArgs;
QString m_makeCmd; QString m_makeCmd;
ProjectExplorer::IOutputParser *m_makeParser;
}; };
class MakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget 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