Merge remote-tracking branch 'origin/4.14'

Change-Id: Ib343adc6b761d15410d357137e4fc38040ce8d48
This commit is contained in:
Eike Ziller
2021-01-20 11:13:11 +01:00
14 changed files with 374 additions and 102 deletions

View File

@@ -1779,8 +1779,11 @@ void DebuggerEngine::showMessage(const QString &msg, int channel, int timeout) c
void DebuggerEngine::notifyDebuggerProcessFinished(int exitCode,
QProcess::ExitStatus exitStatus, const QString &backendName)
{
showMessage(QString("%1 PROCESS FINISHED, status %2, exit code %3")
.arg(backendName).arg(exitStatus).arg(exitCode));
showMessage(QString("%1 PROCESS FINISHED, status %2, exit code %3 (0x%4)")
.arg(backendName)
.arg(exitStatus)
.arg(exitCode)
.arg(QString::number(exitCode, 16)));
switch (state()) {
case DebuggerFinished: