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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Change-Id: If0dbebdf37b0ffea2528bf6ce6d34d88554f8dfb
This commit is contained in:
Eike Ziller
2021-03-16 10:55:54 +01:00
parent 61b278fe6e f820164b1a
commit 4151f091e3
155 changed files with 5552 additions and 3288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -739,7 +739,8 @@ void DebuggerRunTool::start()
}
}
appendMessage(tr("Debugging starts"), NormalMessageFormat);
appendMessage(tr("Debugging %1 ...").arg(m_runParameters.inferior.commandLine().toUserOutput()),
NormalMessageFormat);
QString debuggerName = m_engine->objectName();
if (m_engine2)
debuggerName += ' ' + m_engine2->objectName();
@@ -783,7 +784,12 @@ void DebuggerRunTool::handleEngineFinished(DebuggerEngine *engine)
{
engine->prepareForRestart();
if (--d->engineStopsNeeded == 0) {
appendMessage(tr("Debugging has finished"), NormalMessageFormat);
QString cmd = m_runParameters.inferior.commandLine().toUserOutput();
QString msg = engine->runParameters().exitCode // Main engine.
? tr("Debugging of %1 has finished with exit code %2.")
.arg(cmd).arg(engine->runParameters().exitCode.value())
: tr("Debugging of %1 has finished.").arg(cmd);
appendMessage(msg, NormalMessageFormat);
reportStopped();
}
}