diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp index b3731afb4ed..17c16aec867 100644 --- a/src/libs/utils/launchersocket.cpp +++ b/src/libs/utils/launchersocket.cpp @@ -256,7 +256,7 @@ void CallerHandle::handleFinished(const FinishedSignal *launcherSignal) m_processState = QProcess::NotRunning; m_exitStatus = launcherSignal->exitStatus(); m_exitCode = launcherSignal->exitCode(); - emit finished(m_exitCode, m_exitStatus); + emit finished(); } // Called from launcher's thread exclusively. diff --git a/src/libs/utils/launchersocket.h b/src/libs/utils/launchersocket.h index a87eb602bf5..8198f04440a 100644 --- a/src/libs/utils/launchersocket.h +++ b/src/libs/utils/launchersocket.h @@ -118,7 +118,7 @@ public: signals: void errorOccurred(QProcess::ProcessError error); void started(); - void finished(int exitCode, QProcess::ExitStatus status); + void finished(); void readyReadStandardOutput(); void readyReadStandardError(); diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index de30b3d7106..3cef40e5742 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -528,7 +528,7 @@ public: ProcessSetupData m_setup; void slotTimeout(); - void slotFinished(int exitCode, QProcess::ExitStatus e); + void slotFinished(); void handleError(QProcess::ProcessError error); void clearForRun(); @@ -1255,7 +1255,7 @@ void QtcProcess::beginFeed() void QtcProcess::endFeed() { - d->slotFinished(0, QProcess::NormalExit); + d->slotFinished(); } void QtcProcess::feedStdOut(const QByteArray &data) @@ -1608,8 +1608,10 @@ void QtcProcessPrivate::slotTimeout() } } -void QtcProcessPrivate::slotFinished(int exitCode, QProcess::ExitStatus status) +void QtcProcessPrivate::slotFinished() { + const int exitCode = m_process->exitCode(); + const QProcess::ExitStatus status = m_process->exitStatus(); if (debug) qDebug() << Q_FUNC_INFO << exitCode << status; m_hangTimerCount = 0; diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index e7995643fdc..20989f7d29d 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -309,7 +309,7 @@ public: signals: void started(); - void finished(int exitCode, QProcess::ExitStatus status); + void finished(); void errorOccurred(QProcess::ProcessError error); void readyReadStandardOutput(); void readyReadStandardError(); diff --git a/src/libs/utils/terminalprocess.cpp b/src/libs/utils/terminalprocess.cpp index e844209b6ed..a7dd8ece432 100644 --- a/src/libs/utils/terminalprocess.cpp +++ b/src/libs/utils/terminalprocess.cpp @@ -476,7 +476,7 @@ void TerminalProcess::finish(int exitCode, QProcess::ExitStatus exitStatus) d->m_processId = 0; d->m_exitCode = exitCode; d->m_appStatus = exitStatus; - emit finished(exitCode, exitStatus); + emit finished(); } void TerminalProcess::kickoffProcess() diff --git a/src/libs/utils/terminalprocess_p.h b/src/libs/utils/terminalprocess_p.h index 0fb2006049e..72cfee240e9 100644 --- a/src/libs/utils/terminalprocess_p.h +++ b/src/libs/utils/terminalprocess_p.h @@ -74,7 +74,7 @@ public: signals: void started(); - void finished(int exitCode, QProcess::ExitStatus status); + void finished(); void errorOccurred(QProcess::ProcessError error); private: