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

Docker: Don't swallow output when startup fails

Browse Source 
Previously error output occurring while the PID marker was
not parsed yet was not passed on to the parent QtcProcess.

Change-Id: Id6cbaa13a7d6c62d7a8612e118092eb2be6e790c
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-03-02 11:15:51 +01:00
parent 5e3af5b0f5
commit 78b1407adf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,8 +238,8 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva
}); });
connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] { connect(&m_process, &QtcProcess::readyReadStandardOutput, this, [this] {
if (!m_hasReceivedFirstOutput) {
QByteArray output = m_process.readAllRawStandardOutput(); QByteArray output = m_process.readAllRawStandardOutput();
if (!m_hasReceivedFirstOutput) {
qsizetype idx = output.indexOf('\n'); qsizetype idx = output.indexOf('\n');
QByteArray firstLine = output.left(idx).trimmed(); QByteArray firstLine = output.left(idx).trimmed();
QByteArray rest = output.mid(idx + 1); QByteArray rest = output.mid(idx + 1);
@@ -259,7 +259,7 @@ DockerProcessImpl::DockerProcessImpl(IDevice::ConstPtr device, DockerDevicePriva
return; return;
} }
} }
emit readyRead(m_process.readAllRawStandardOutput(), {}); emit readyRead(output, {});
}); });
connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] { connect(&m_process, &QtcProcess::readyReadStandardError, this, [this] {