From 03f0997b1e6c03e39140ebaa3ebb9202cb7e4417 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 5 May 2022 20:55:53 +0200
Subject: [PATCH] QtcProcess: Don't read error channel when MergedChannels
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/libs/utils/qtcprocess.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 6e2e38ff7a9..63af544cf26 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); }