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

Fix building with ABLD on symbian

Browse Source 
* Output parser was deleted to early, resulting in creator assuming
   that the build had failed.
This commit is contained in:
Tobias Hunger
2010-09-07 15:50:52 +02:00
parent c2338d20a5
commit 3dc4bd6dc9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/abstractprocessstep.cpp
View File

@@ -188,6 +188,12 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi)
processFinished(m_process->exitCode(), m_process->exitStatus()); processFinished(m_process->exitCode(), m_process->exitStatus());
bool returnValue = processSucceeded(m_process->exitCode(), m_process->exitStatus()) || m_ignoreReturnValue; bool returnValue = processSucceeded(m_process->exitCode(), m_process->exitStatus()) || m_ignoreReturnValue;
// Clean up output parsers
if (m_outputParserChain) {
delete m_outputParserChain;
m_outputParserChain = 0;
}
delete m_process; delete m_process;
m_process = 0; m_process = 0;
delete m_eventLoop; delete m_eventLoop;
@@ -204,12 +210,6 @@ void AbstractProcessStep::processStarted()
void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus status) void AbstractProcessStep::processFinished(int exitCode, QProcess::ExitStatus status)
{ {
// Clean up output parsers
if (m_outputParserChain) {
delete m_outputParserChain;
m_outputParserChain = 0;
}
if (status == QProcess::NormalExit && exitCode == 0) { if (status == QProcess::NormalExit && exitCode == 0) {
emit addOutput(tr("The process \"%1\" exited normally.") emit addOutput(tr("The process \"%1\" exited normally.")
.arg(QDir::toNativeSeparators(m_command)), .arg(QDir::toNativeSeparators(m_command)),