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

Utils: use cleaned stdout all over the place again

Browse Source 
Amends 5ee880ce5e

Change-Id: Ie0202db7d8455372c3697087d9571db6706b45a1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2022-06-17 14:17:14 +02:00
parent dcd3d9e717
commit 153ff77a6b
48 changed files with 145 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/docker/dockerdevice.cpp
View File

@@ -444,7 +444,7 @@ void DockerDevicePrivate::startContainer()
if (createProcess.result() != ProcessResult::FinishedWithSuccess)
return;
m_container = createProcess.stdOut().trimmed();
m_container = createProcess.cleanedStdOut().trimmed();
if (m_container.isEmpty())
return;
LOG("Container via process: " << m_container);
@@ -988,11 +988,11 @@ void DockerDevicePrivate::fetchSystemEnviroment()
proc.setCommand(q->withDockerExecCmd({"env", {}}));
proc.start();
proc.waitForFinished();
const QString remoteOutput = proc.stdOut();
const QString remoteOutput = proc.cleanedStdOut();
m_cachedEnviroment = Environment(remoteOutput.split('\n', Qt::SkipEmptyParts), q->osType());
const QString remoteError = proc.stdErr();
const QString remoteError = proc.cleanedStdErr();
if (!remoteError.isEmpty())
qWarning("Cannot read container environment: %s\n", qPrintable(remoteError));
}
@@ -1126,7 +1126,7 @@ public:
});
connect(m_process, &Utils::QtcProcess::readyReadStandardError, this, [this] {
const QString out = DockerDevice::tr("Error: %1").arg(m_process->stdErr());
const QString out = DockerDevice::tr("Error: %1").arg(m_process->cleanedStdErr());
m_log->append(DockerDevice::tr("Error: %1").arg(out));
});