summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-11-26 16:52:01 +0100
committerTim Jenssen <tim.jenssen@digia.com>2013-11-28 08:28:36 +0100
commitf3085056a88681fbc54ff3ba232ee1f7a4540023 (patch)
treec693247ebe0fb5555b9309949ce8c09e7df69701
parent54b2ec315818544c1c51a59af0a1fe98bb266665 (diff)
read the output even if qmake crashed
Change-Id: Ib9258b23610db4633c390d3a093b581c2f4c1c84 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
-rw-r--r--src/libs/installer/qtpatch.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp
index 7a1e18df3..7ffb42d5a 100644
--- a/src/libs/installer/qtpatch.cpp
+++ b/src/libs/installer/qtpatch.cpp
@@ -93,12 +93,12 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
QProcess process;
process.start(qmake.absoluteFilePath(), args, QIODevice::ReadOnly);
if (process.waitForFinished(2000)) {
+ QByteArray output = process.readAllStandardOutput();
+ qmakeOutput->append(output);
if (process.exitStatus() == QProcess::CrashExit) {
qDebug() << qmakePath << "was crashed";
return qmakeValueHash;
}
- QByteArray output = process.readAllStandardOutput();
- qmakeOutput->append(output);
qmakeValueHash = readQmakeOutput(output);
}
if (qmakeValueHash.isEmpty()) {