Debugger: Streamline ramping down

There were only two used target states, and in case of mixed
debugging all parts of the machinery better agree on the
direction. So one bool in the (shared) runTool is sufficient.

Change-Id: Iffbf1651b82dde707cfc37d8da9d3da573b34b76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-05-19 11:54:13 +02:00
parent 5e84af54a0
commit 36ec37b29d
10 changed files with 44 additions and 69 deletions

View File

@@ -272,7 +272,7 @@ QString GdbEngine::errorMessage(QProcess::ProcessError error)
"permissions to invoke the program.\n%2")
.arg(runParameters().debugger.executable, m_gdbProc.errorString());
case QProcess::Crashed:
if (targetState() == DebuggerFinished)
if (isDying())
return tr("The gdb process crashed some time after starting "
"successfully.");
else
@@ -4085,7 +4085,7 @@ void GdbEngine::handleGdbFinished(int exitCode, QProcess::ExitStatus exitStatus)
void GdbEngine::abortDebugger()
{
if (targetState() == DebuggerFinished) {
if (isDying()) {
// We already tried. Try harder.
showMessage("ABORTING DEBUGGER. SECOND TIME.");
m_gdbProc.kill();