feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Use outputCodec for stdErr

Browse Source 
Change-Id: I0e9b4b1aa48bfab8ff84d2559d6971ca9fdde5b6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-02 12:10:07 +03:00
committed by Orgad Shaneh
parent 07d486ce94
commit f5afaac070
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -863,14 +863,15 @@ static SynchronousProcessResponse runVcsFullySynchronously(const QString &workin
&stdOut, &stdErr, true); &stdOut, &stdErr, true);
if (!stdErr.isEmpty()) { 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)) if (!(flags & VcsBasePlugin::SuppressStdErrInLogWindow))
outputWindow->append(response.stdErr); outputWindow->append(response.stdErr);
} }
if (!stdOut.isEmpty()) { if (!stdOut.isEmpty()) {
response.stdOut = (outputCodec ? outputCodec->toUnicode(stdOut) : QString::fromLocal8Bit(stdOut)) response.stdOut = (outputCodec ? outputCodec->toUnicode(stdOut) : QString::fromLocal8Bit(stdOut));
.remove(QLatin1Char('\r')); response.stdOut.remove(QLatin1Char('\r'));
if (flags & VcsBasePlugin::ShowStdOutInLogWindow) { if (flags & VcsBasePlugin::ShowStdOutInLogWindow) {
if (flags & VcsBasePlugin::SilentOutput) if (flags & VcsBasePlugin::SilentOutput)
outputWindow->appendSilently(response.stdOut); outputWindow->appendSilently(response.stdOut);