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

Fixes: work on QT_NO_CAST_FROM_BYTEARRAY

Browse Source
This commit is contained in:
hjk
2009-02-19 12:09:05 +01:00
parent 9c80a46987
commit 57524485b7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/synchronousprocess.cpp
View File

@@ -309,12 +309,12 @@ void SynchronousProcess::stdErrReady()
QString SynchronousProcess::convertStdErr(const QByteArray &ba) QString SynchronousProcess::convertStdErr(const QByteArray &ba)
{ {
return QString::fromLocal8Bit(ba).remove(QLatin1Char('\r')); return QString::fromLocal8Bit(ba.constData(), ba.size()).remove(QLatin1Char('\r'));
} }
QString SynchronousProcess::convertStdOut(const QByteArray &ba) const QString SynchronousProcess::convertStdOut(const QByteArray &ba) const
{ {
QString stdOut = m_d->m_stdOutCodec ? m_d->m_stdOutCodec->toUnicode(ba) : QString::fromLocal8Bit(ba); QString stdOut = m_d->m_stdOutCodec ? m_d->m_stdOutCodec->toUnicode(ba) : QString::fromLocal8Bit(ba.constData(), ba.size());
return stdOut.remove(QLatin1Char('\r')); return stdOut.remove(QLatin1Char('\r'));
} }