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

8
src/plugins/mesonprojectmanager/mesonprocess.cpp
View File

@@ -51,8 +51,8 @@ void MesonProcess::handleProcessDone()
ProjectExplorer::TaskHub::addTask(ProjectExplorer::BuildSystemTask{
ProjectExplorer::Task::TaskType::Error, m_process->exitMessage()});
}
m_stdo = m_process->readAllStandardOutput();
m_stderr = m_process->readAllStandardError();
m_stdo = m_process->readAllRawStandardOutput();
m_stderr = m_process->readAllRawStandardError();
const QString elapsedTime = formatElapsedTime(m_elapsed.elapsed());
MessageManager::writeSilently(elapsedTime);
emit finished(m_process->exitCode(), m_process->exitStatus());
@@ -105,14 +105,14 @@ bool MesonProcess::sanityCheck(const Command &command) const
void MesonProcess::processStandardOutput()
{
const auto data = m_process->readAllStandardOutput();
const auto data = m_process->readAllRawStandardOutput();
MessageManager::writeSilently(QString::fromLocal8Bit(data));
emit readyReadStandardOutput(data);
}
void MesonProcess::processStandardError()
{
MessageManager::writeSilently(QString::fromLocal8Bit(m_process->readAllStandardError()));
MessageManager::writeSilently(QString::fromLocal8Bit(m_process->readAllRawStandardError()));
}
} // namespace Internal

2
src/plugins/mesonprojectmanager/mesonwrapper.h
View File

@@ -42,7 +42,7 @@ inline bool run_meson(const Command &command, QIODevice *output = nullptr)
if (!process.waitForFinished())
return false;
if (output) {
output->write(process.readAllStandardOutput());
output->write(process.readAllRawStandardOutput());
}
return process.exitCode() == 0;
}