forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -378,7 +378,12 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
QByteArray readAllStandardOutput() override { return m_process->readAllStandardOutput(); }
|
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
|
void setProcessEnvironment(const QProcessEnvironment &environment) override
|
||||||
{ m_process->setProcessEnvironment(environment); }
|
{ m_process->setProcessEnvironment(environment); }
|
||||||
|
Reference in New Issue
Block a user