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

Debugger: Use ProcessResultData a bit more

Browse Source 
Instead of its individual items.

Change-Id: Icd668a61de1c2de676e0a44769f1c1bb5375c523
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-06-16 17:28:02 +02:00
parent aa117f9955
commit af4a6b1a74
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/debuggerengine.cpp
View File

@@ -77,6 +77,7 @@
#include <utils/checkablemessagebox.h>
#include <utils/macroexpander.h>
#include <utils/processhandle.h>
#include <utils/processinterface.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/styledbar.h>
@@ -1789,14 +1790,14 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
}
}
void DebuggerEngine::notifyDebuggerProcessFinished(int exitCode,
QProcess::ExitStatus exitStatus, const QString &backendName)
void DebuggerEngine::notifyDebuggerProcessFinished(const ProcessResultData &result,
const QString &backendName)
{
showMessage(QString("%1 PROCESS FINISHED, status %2, exit code %3 (0x%4)")
.arg(backendName)
.arg(exitStatus)
.arg(exitCode)
.arg(QString::number(exitCode, 16)));
.arg(result.m_exitStatus)
.arg(result.m_exitCode)
.arg(QString::number(result.m_exitCode, 16)));
switch (state()) {
case DebuggerFinished:
@@ -1816,9 +1817,9 @@ void DebuggerEngine::notifyDebuggerProcessFinished(int exitCode,
default: {
// Initiate shutdown sequence
notifyInferiorIll();
const QString msg = exitStatus == QProcess::CrashExit ?
const QString msg = result.m_exitStatus == QProcess::CrashExit ?
tr("The %1 process terminated.") :
tr("The %2 process terminated unexpectedly (exit code %1).").arg(exitCode);
tr("The %2 process terminated unexpectedly (exit code %1).").arg(result.m_exitCode);
AsynchronousMessageBox::critical(tr("Unexpected %1 Exit").arg(backendName),
msg.arg(backendName));
break;