summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-11-28 16:10:49 +0100
committerKai Koehne <kai.koehne@digia.com>2013-11-28 17:02:26 +0100
commit402ddc90d84b8a67c1435de99490e2e197244d11 (patch)
treef135d95af4523313fe5b446472a702615f83c9f0
parent2224de8706929472f458fd9e94b8bffcc8887c99 (diff)
Enhance debugging output if process crashed
Change-Id: I411bd70100a0c16bd2e5422d00f744a0aeca7f3f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r--src/libs/installer/consumeoutputoperation.cpp4
-rw-r--r--src/libs/installer/qtpatch.cpp6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/libs/installer/consumeoutputoperation.cpp b/src/libs/installer/consumeoutputoperation.cpp
index 9f747b890..95d143b4a 100644
--- a/src/libs/installer/consumeoutputoperation.cpp
+++ b/src/libs/installer/consumeoutputoperation.cpp
@@ -114,6 +114,10 @@ bool ConsumeOutputOperation::performOperation()
process.start(executable.absoluteFilePath(), processArguments, QIODevice::ReadOnly);
if (process.waitForFinished(10000)) {
if (process.exitStatus() == QProcess::CrashExit) {
+ qWarning() << executable.absoluteFilePath() << processArguments
+ << "crashed with exit code" << process.exitCode()
+ << "standard output: " << process.readAllStandardOutput()
+ << "error output: " << process.readAllStandardError();
setError(UserDefinedError);
setErrorString(tr("Running '%1' resulted in a crash.").arg(
QDir::toNativeSeparators(executable.absoluteFilePath())));
diff --git a/src/libs/installer/qtpatch.cpp b/src/libs/installer/qtpatch.cpp
index 0494269c7..825c9ad48 100644
--- a/src/libs/installer/qtpatch.cpp
+++ b/src/libs/installer/qtpatch.cpp
@@ -96,8 +96,10 @@ QHash<QString, QByteArray> QtPatch::qmakeValues(const QString &qmakePath, QByteA
QByteArray output = process.readAllStandardOutput();
qmakeOutput->append(output);
if (process.exitStatus() == QProcess::CrashExit) {
- qWarning() << qmakePath << QString::fromLatin1(" crashed with exit code: %1").arg(
- process.exitCode());
+ qWarning() << qmake.absoluteFilePath() << args
+ << "crashed with exit code" << process.exitCode()
+ << "standard output: " << output
+ << "error output: " << process.readAllStandardError();
return qmakeValueHash;
}
qmakeValueHash = readQmakeOutput(output);