aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-08-26 13:47:20 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-08-26 13:47:20 +0200
commit7dd870f21601301aca67548e96866204cec3e852 (patch)
tree36ae72dfc06c7b1d97ab4f0b8fb9ebfb0339663b /src
parentc6e49568deaf973df276d5168714df0c9a2aad85 (diff)
parent817a292690ccdea7bae185319beb22ea653db946 (diff)
Merge 1.14 into master
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/buildgraph/processcommandexecutor.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index f8a86cfe8..79edda320 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -277,7 +277,9 @@ void ProcessCommandExecutor::getProcessOutput(bool stdOut, ProcessResult &result
}
QString contentString = filterProcessOutput(content, filterFunction);
if (!redirectPath.isEmpty()) {
- const QProcess::ProcessError error = saveToFile(redirectPath, contentString.toLocal8Bit());
+ const QByteArray dataToWrite = filterFunction.isEmpty() ? content
+ : contentString.toLocal8Bit();
+ const QProcess::ProcessError error = saveToFile(redirectPath, dataToWrite);
if (result.error() == QProcess::UnknownError && error != QProcess::UnknownError)
result.d->error = error;
} else {