diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-10 15:23:20 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-13 10:48:01 +0000 |
| commit | 7c083eadee877212ae64083e73a8939be7bc9e31 (patch) | |
| tree | 8f6920de310cd44f5d8e834e49061cc1b300ac10 /src/plugins/mercurial | |
| parent | 60f5372b6793f33a711b60113087910136d21b14 (diff) | |
| download | qt-creator-7c083eadee877212ae64083e73a8939be7bc9e31.tar.gz | |
Vcs: Make VcsBaseClient return stderr on fullySynchronous execution
Change-Id: I7a72a2f865148d7cf375897ec944a45f4b440818
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/mercurial')
| -rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index 82ed3dc995..f53c816fe8 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -244,7 +244,7 @@ QString MercurialClient::shortDescriptionSync(const QString &workingDirectory, QByteArray outputData; if (!vcsFullySynchronousExec(workingDirectory, args, &outputData)) return revision; - description = SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(outputData)); + description = commandOutputFromLocal8Bit(outputData); if (description.endsWith(QLatin1Char('\n'))) description.truncate(description.size() - 1); return description; |