From 3dc4bd6dc99de509f80e9e70a035f0a0c5aaf112 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 7 Sep 2010 15:50:52 +0200
Subject: [PATCH] Fix building with ABLD on symbian
* Output parser was deleted to early, resulting in creator assuming
that the build had failed.
---
src/plugins/projectexplorer/abstractprocessstep.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 2a42a58fd30..bc93d08265f 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -188,6 +188,12 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi)
processFinished(m_process->exitCode(), m_process->exitStatus());
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;
m_process = 0;
delete m_eventLoop;
@@ -204,12 +210,6 @@ void AbstractProcessStep::processStarted()
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) {
emit addOutput(tr("The process \"%1\" exited normally.")
.arg(QDir::toNativeSeparators(m_command)),
--
GitLab