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

LinuxProcessInterface: Fix error reporting on failed to start

Browse Source 
Change-Id: I2af4a13289458e6270452a254cf90f7bd9cc3684
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-05-25 20:08:12 +02:00
parent 21d3f0d51e
commit a7fa8c46ee
4 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -448,6 +448,11 @@ void SshProcessInterface::handleStarted(qint64 processId)
emitStarted(processId);
}
void SshProcessInterface::handleDone(const ProcessResultData &resultData)
{
emit done(resultData);
}
void SshProcessInterface::handleReadyReadStandardOutput(const QByteArray &outputData)
{
emit readyRead(outputData, {});
@@ -580,6 +585,20 @@ void LinuxProcessInterface::handleStarted(qint64 processId)
emitStarted(processId);
}
void LinuxProcessInterface::handleDone(const ProcessResultData &resultData)
{
ProcessResultData finalData = resultData;
if (!m_pidParsed) {
finalData.m_error = QProcess::FailedToStart;
if (!m_error.isEmpty()) {
if (!finalData.m_errorString.isEmpty())
finalData.m_errorString += "\n";
finalData.m_errorString += QString::fromLocal8Bit(m_error);
}
}
emit done(finalData);
}
void LinuxProcessInterface::handleReadyReadStandardOutput(const QByteArray &outputData)
{
if (m_pidParsed) {
@@ -690,8 +709,9 @@ void SshProcessInterfacePrivate::handleStarted()
void SshProcessInterfacePrivate::handleDone()
{
m_connectionHandle.reset();
emit q->done(m_process.resultData());
if (m_connectionHandle) // TODO: should it disconnect from signals first?
m_connectionHandle.release()->deleteLater();
q->handleDone(m_process.resultData());
}
void SshProcessInterfacePrivate::handleReadyReadStandardOutput()