summaryrefslogtreecommitdiff
path: root/src/plugins/mercurial
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-07-05 12:00:59 +0200
committerTobias Hunger <tobias.hunger@qt.io>2016-07-15 14:16:03 +0000
commit5efd82468b0802fd0f6993b8a430acc09c6293a9 (patch)
tree5d03cd6b2d0bd32223b4b0c12015b49200c0fa13 /src/plugins/mercurial
parent86882018dd39205ba281d9edcd54008e0b9d4156 (diff)
downloadqt-creator-5efd82468b0802fd0f6993b8a430acc09c6293a9.tar.gz
SynchronousProcess: Store raw bytes from stdout/stderr of the process
Only convert the raw output later in a stdOut() and stdErr() method of the SynchronousProcessResponse. This is necessary since we have processes that use different encodings for different sections of the file (I am looking at you, git). Also remove the signals for raw data on stdout/stderr, leaving only the signals returning buffered QString lines. This should be safe, even with UTF-16 output. Change-Id: Ida613fa86d1468cbd33bc6b3a1506a849c2d1c0a Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 30af8ba98e..abc4835ed8 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -157,7 +157,7 @@ bool MercurialClient::synchronousPull(const QString &workingDir, const QString &
workingDir, vcsBinary(), args, vcsTimeoutS(), flags, 0, env);
const bool ok = resp.result == SynchronousProcessResponse::Finished;
- parsePullOutput(resp.stdOut.trimmed());
+ parsePullOutput(resp.stdOut().trimmed());
return ok;
}