diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-05-05 20:55:53 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-05-06 14:27:18 +0000 |
commit | 03f0997b1e6c03e39140ebaa3ebb9202cb7e4417 (patch) | |
tree | 24d05c55797ab1c4d3e781411a0c5cc02ef46f02 | |
parent | f52c9e70619f1ba6c15f762b8407e75759d9980c (diff) |
QtcProcess: Don't read error channel when MergedChannels
Fixes: QTCREATORBUG-27383
Change-Id: I5034c50fc876c5580148bb7806479da3163b08fc
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
-rw-r--r-- | src/libs/utils/qtcprocess.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 6e2e38ff7a..63af544cf2 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -378,7 +378,12 @@ public: } QByteArray readAllStandardOutput() override { return m_process->readAllStandardOutput(); } - QByteArray readAllStandardError() override { return m_process->readAllStandardError(); } + QByteArray readAllStandardError() override + { + if (m_process->processChannelMode() == QProcess::MergedChannels) + return {}; + return m_process->readAllStandardError(); + } void setProcessEnvironment(const QProcessEnvironment &environment) override { m_process->setProcessEnvironment(environment); } |