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

Debugger: Make second call to abort LLDB more lethal

Browse Source 
Change-Id: I66cfb1e01193c57e06aebeaa8defa11809e24c50
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-11-06 14:23:08 +01:00
parent 57c098142c
commit 25ec26bcf3
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -126,6 +126,19 @@ void LldbEngine::shutdownEngine()
m_lldbProc.kill(); m_lldbProc.kill();
} }
void LldbEngine::abortDebugger()
{
if (targetState() == DebuggerFinished) {
// We already tried. Try harder.
showMessage(_("ABORTING DEBUGGER. SECOND TIME."));
m_lldbProc.kill();
} else {
// Be friendly the first time. This will change targetState().
showMessage(_("ABORTING DEBUGGER. FIRST TIME."));
quitDebugger();
}
}
void LldbEngine::setupEngine() void LldbEngine::setupEngine()
{ {
QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state()); QTC_ASSERT(state() == EngineSetupRequested, qDebug() << state());

1
src/plugins/debugger/lldb/lldbengine.h
View File

@@ -100,6 +100,7 @@ private:
void runEngine(); void runEngine();
void shutdownInferior(); void shutdownInferior();
void shutdownEngine(); void shutdownEngine();
void abortDebugger();
bool setToolTipExpression(const QPoint &mousePos, bool setToolTipExpression(const QPoint &mousePos,
TextEditor::ITextEditor *editor, const DebuggerToolTipContext &); TextEditor::ITextEditor *editor, const DebuggerToolTipContext &);