forked from qt-creator/qt-creator
Utils: Rename QtcProcess::readAllStandard* to readAllRawStandard*
... and re-use the old QtcProcess::readAllStandard* names for a QString-returning 'decoded' version. For now, only use that in 'full Utf8' cases, to stay bug-compatible, the plan is, however, to employ the QTextCodecs we have already in the channel buffers. That will be one-by-one, though. Change-Id: Id209e0671920d4ea4197918e872f441254112d52 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -39,7 +39,7 @@ void AndroidSignalOperation::adbFindRunAsFinished()
|
||||
m_timeout->stop();
|
||||
|
||||
handleCrashMessage();
|
||||
const QString runAs = QString::fromLatin1(m_adbProcess->readAllStandardOutput());
|
||||
const QString runAs = QString::fromLatin1(m_adbProcess->readAllRawStandardOutput());
|
||||
m_adbProcess.release()->deleteLater();
|
||||
if (runAs.isEmpty() || !m_errorMessage.isEmpty()) {
|
||||
m_errorMessage.prepend(QLatin1String("Cannot find User for process: ")
|
||||
@@ -59,7 +59,7 @@ void AndroidSignalOperation::adbKillFinished()
|
||||
m_timeout->stop();
|
||||
|
||||
if (!handleCrashMessage())
|
||||
m_errorMessage = QString::fromLatin1(m_adbProcess->readAllStandardError());
|
||||
m_errorMessage = QString::fromLatin1(m_adbProcess->readAllRawStandardError());
|
||||
m_adbProcess.release()->deleteLater();
|
||||
if (!m_errorMessage.isEmpty())
|
||||
m_errorMessage.prepend(QLatin1String("Cannot kill process: ") + QString::number(m_pid));
|
||||
|
||||
Reference in New Issue
Block a user