diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-08-02 12:10:07 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-08-02 11:58:22 +0200 |
| commit | f5afaac0704e2e51d055c74079b3c5bee5d63a6b (patch) | |
| tree | 8271d9bfe2a1332d7ad092e82089a0007e3f71b8 | |
| parent | 07d486ce949a5274743907b0b3bec751a3eabb1d (diff) | |
| download | qt-creator-f5afaac0704e2e51d055c74079b3c5bee5d63a6b.tar.gz | |
VCS: Use outputCodec for stdErr
Change-Id: I0e9b4b1aa48bfab8ff84d2559d6971ca9fdde5b6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseplugin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index c0312e2bdb..703b79f5bb 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -863,14 +863,15 @@ static SynchronousProcessResponse runVcsFullySynchronously(const QString &workin &stdOut, &stdErr, true); if (!stdErr.isEmpty()) { - response.stdErr = QString::fromLocal8Bit(stdErr).remove(QLatin1Char('\r')); + response.stdErr = (outputCodec ? outputCodec->toUnicode(stdErr) : QString::fromLocal8Bit(stdErr)); + response.stdErr.remove(QLatin1Char('\r')); if (!(flags & VcsBasePlugin::SuppressStdErrInLogWindow)) outputWindow->append(response.stdErr); } if (!stdOut.isEmpty()) { - response.stdOut = (outputCodec ? outputCodec->toUnicode(stdOut) : QString::fromLocal8Bit(stdOut)) - .remove(QLatin1Char('\r')); + response.stdOut = (outputCodec ? outputCodec->toUnicode(stdOut) : QString::fromLocal8Bit(stdOut)); + response.stdOut.remove(QLatin1Char('\r')); if (flags & VcsBasePlugin::ShowStdOutInLogWindow) { if (flags & VcsBasePlugin::SilentOutput) outputWindow->appendSilently(response.stdOut); |