summaryrefslogtreecommitdiff
path: root/src/plugins/perforce
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2022-06-17 14:17:14 +0200
committerDavid Schulz <david.schulz@qt.io>2022-06-17 13:04:42 +0000
commit153ff77a6b4f9b1a36d4c56d6349cde76664e754 (patch)
treebdac8ba8aaea8407aeb3d963bb324fee0cb44d60 /src/plugins/perforce
parentdcd3d9e71788953af3ee7cb4495805da19c62c34 (diff)
downloadqt-creator-153ff77a6b4f9b1a36d4c56d6349cde76664e754.tar.gz
Utils: use cleaned stdout all over the place again
Amends 5ee880ce5e6998170823e6fc9afb6b6c36c6170a Change-Id: Ie0202db7d8455372c3697087d9571db6706b45a1 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r--src/plugins/perforce/perforcechecker.cpp4
-rw-r--r--src/plugins/perforce/perforceplugin.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp
index 3dc7f73d50..8ce4f04d39 100644
--- a/src/plugins/perforce/perforcechecker.cpp
+++ b/src/plugins/perforce/perforcechecker.cpp
@@ -127,11 +127,11 @@ void PerforceChecker::slotDone()
break;
case QProcess::NormalExit:
if (m_process.exitCode()) {
- const QString stdErr = m_process.stdErr();
+ const QString stdErr = m_process.cleanedStdErr();
emitFailed(tr("\"%1\" terminated with exit code %2: %3").
arg(m_binary.toUserOutput()).arg(m_process.exitCode()).arg(stdErr));
} else {
- parseOutput(m_process.stdOut());
+ parseOutput(m_process.cleanedStdOut());
}
break;
}
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 4c7039d260..84ecf55721 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1277,8 +1277,8 @@ PerforceResponse PerforcePluginPrivate::synchronousProcess(const FilePath &worki
PerforceResponse response;
response.error = true;
response.exitCode = process.exitCode();
- response.stdErr = process.stdErr();
- response.stdOut = process.stdOut();
+ response.stdErr = process.cleanedStdErr();
+ response.stdOut = process.cleanedStdOut();
switch (process.result()) {
case ProcessResult::FinishedWithSuccess:
response.error = false;