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

Utils: Rename QtcProcess::readAllStandard* to readAllRawStandard*

Browse Source 
... 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:
hjk
2023-01-05 17:55:04 +01:00
parent f08b5727dc
commit 4ddd28ae22
69 changed files with 147 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/python/pipsupport.cpp
View File

@@ -88,14 +88,14 @@ void PipInstallTask::handleDone()
void PipInstallTask::handleOutput()
{
const QString &stdOut = QString::fromLocal8Bit(m_process.readAllStandardOutput().trimmed());
const QString &stdOut = QString::fromLocal8Bit(m_process.readAllRawStandardOutput().trimmed());
if (!stdOut.isEmpty())
Core::MessageManager::writeSilently(stdOut);
}
void PipInstallTask::handleError()
{
const QString &stdErr = QString::fromLocal8Bit(m_process.readAllStandardError().trimmed());
const QString &stdErr = QString::fromLocal8Bit(m_process.readAllRawStandardError().trimmed());
if (!stdErr.isEmpty())
Core::MessageManager::writeSilently(stdErr);
}

2
src/plugins/python/pysideuicextracompiler.cpp
View File

@@ -41,7 +41,7 @@ FileNameToContentsHash PySideUicExtraCompiler::handleProcessFinished(QtcProcess
return result;
// As far as I can discover in the UIC sources, it writes out local 8-bit encoding. The
// conversion below is to normalize both the encoding, and the line terminators.
result[targetList.first()] = QString::fromLocal8Bit(process->readAllStandardOutput()).toUtf8();
result[targetList.first()] = QString::fromLocal8Bit(process->readAllRawStandardOutput()).toUtf8();
return result;
}