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

Version control: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-31 10:57:10 +01:00
committed by Tobias Hunger
parent cdae5f2102
commit e2ace515e2
28 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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