From aa117f9955df9c2c266a799df41be8988c892f27 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 16 Jun 2022 15:27:39 +0200 Subject: [PATCH] QbsSession: Connect to done() signal Instead of connecting to errorOccurred() and finished() signals. Change-Id: I164338c17acf6ec0eff5c514d6919a27c3feaae8 Reviewed-by: Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbssession.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbssession.cpp b/src/plugins/qbsprojectmanager/qbssession.cpp index 76bf4e14c00..bd2c3ecb496 100644 --- a/src/plugins/qbsprojectmanager/qbssession.cpp +++ b/src/plugins/qbsprojectmanager/qbssession.cpp @@ -182,23 +182,12 @@ void QbsSession::initialize() connect(d->qbsProcess, &QtcProcess::readyReadStandardError, this, [this] { qCDebug(qbsPmLog) << "[qbs stderr]: " << d->qbsProcess->readAllStandardError(); }); - connect(d->qbsProcess, &QtcProcess::errorOccurred, this, [this](QProcess::ProcessError e) { - d->eventLoop.exit(1); - switch (e) { - case QProcess::FailedToStart: + connect(d->qbsProcess, &QtcProcess::done, this, [this] { + if (d->qbsProcess->result() == ProcessResult::StartFailed) { + d->eventLoop.exit(1); setError(Error::QbsFailedToStart); - break; - case QProcess::WriteError: - case QProcess::ReadError: - setError(Error::ProtocolError); - break; - case QProcess::Crashed: - case QProcess::Timedout: - case QProcess::UnknownError: - break; + return; } - }); - connect(d->qbsProcess, &QtcProcess::finished, this, [this] { d->qbsProcess->deleteLater(); switch (d->state) { case State::Inactive: