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

Debugger: Move part of debugger ramp-down to DebuggerRunTool

Browse Source 
DebuggerRunTool and debugger backend process have (almost) a 1:1
correspondence, unlike engines or the debugger plugin itself.
So it makes sense to accumulate backend start/rampdown login
in DebuggerRunTool.

Change-Id: Ia105283bcdf2641c7e9a401b4146b34c20605ba7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-05-25 17:33:20 +02:00
parent 65be72d64d
commit 449a749dd7
4 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -701,7 +701,18 @@ void DebuggerRunTool::quitDebugger()
void DebuggerRunTool::abortDebugger()
{
m_engine->abortDebugger();
m_engine->resetLocation();
if (!m_isDying) {
// Be friendly the first time. This will change targetState().
showMessage("ABORTING DEBUGGER. FIRST TIME.");
quitDebugger();
} else {
// We already tried. Try harder.
showMessage("ABORTING DEBUGGER. SECOND TIME.");
m_engine->abortDebuggerProcess();
if (runControl())
runControl()->initiateFinish();
}
}
bool DebuggerRunTool::fixupParameters()