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

Qt4: Simplify makestep

Browse Source 
* Remove unnecessary member variable.
This commit is contained in:
Tobias Hunger
2010-12-09 10:41:13 +01:00
parent 88b77ba838
commit 3ec173bfdd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,14 +180,15 @@ bool MakeStep::init()
setEnabled(true);
pp->setArguments(args);
m_makeParser = bc->qtVersion()->createOutputParser();
m_makeParser->appendOutputParser(new QtParser);
ProjectExplorer::IOutputParser *parser = bc->qtVersion()->createOutputParser();
Q_ASSERT(parser);
parser->appendOutputParser(new QtParser);
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();
}
@@ -205,7 +206,7 @@ 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.
if (m_makeParser && m_makeParser->hasFatalErrors())
if (outputParser() && outputParser()->hasFatalErrors())
return false;
return AbstractProcessStep::processSucceeded(exitCode, status);

1
src/plugins/qt4projectmanager/makestep.h
View File

@@ -111,7 +111,6 @@ private:
bool m_clean;
QString m_userArgs;
QString m_makeCmd;
ProjectExplorer::IOutputParser *m_makeParser;
};
class MakeStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget