From 57524485b7446575d0d0de5235cc375a079bce0e Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 19 Feb 2009 12:09:05 +0100 Subject: [PATCH] Fixes: work on QT_NO_CAST_FROM_BYTEARRAY --- src/libs/utils/synchronousprocess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp index 852f5546be7..667416a3406 100644 --- a/src/libs/utils/synchronousprocess.cpp +++ b/src/libs/utils/synchronousprocess.cpp @@ -309,12 +309,12 @@ void SynchronousProcess::stdErrReady() 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 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')); }