From f3085056a88681fbc54ff3ba232ee1f7a4540023 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 26 Nov 2013 16:52:01 +0100 Subject: read the output even if qmake crashed Change-Id: Ib9258b23610db4633c390d3a093b581c2f4c1c84 Reviewed-by: Kai Koehne Reviewed-by: Karsten Heimrich --- src/libs/installer/qtpatch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libs/installer/qtpatch.cpp') 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 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()) { -- cgit v1.2.3