diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2019-08-28 11:38:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-08-28 11:38:35 +0000 |
| commit | 037ed366c6f3cd57a3d8a40f1ce0a0050e0855ec (patch) | |
| tree | 011346189c8615bad6612ae3e1d29f218a9fed55 /src/lib/corelib | |
| parent | 52f4eccf83d8c0f4519216fede7e8311fd275f70 (diff) | |
| parent | 7dd870f21601301aca67548e96866204cec3e852 (diff) | |
Merge "Merge 1.14 into master"
Diffstat (limited to 'src/lib/corelib')
| -rw-r--r-- | src/lib/corelib/buildgraph/processcommandexecutor.cpp | 4 |
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 { |