Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
d8cc842d
Commit
d8cc842d
authored
Apr 09, 2010
by
hjk
Browse files
debugger: let 'Reset Debugger' apply a bit more force
parent
11993d19
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermanager.cpp
View file @
d8cc842d
...
...
@@ -543,7 +543,7 @@ void DebuggerManager::init()
connect
(
d
->
m_actions
.
stopAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
interruptDebuggingRequest
()));
connect
(
d
->
m_actions
.
resetAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
exi
tDebugger
()));
this
,
SLOT
(
abor
tDebugger
()));
connect
(
d
->
m_actions
.
nextAction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
executeStepNext
()));
connect
(
d
->
m_actions
.
stepAction
,
SIGNAL
(
triggered
()),
...
...
@@ -1146,6 +1146,13 @@ void DebuggerManager::exitDebugger()
d
->
m_codeModelSnapshot
=
CPlusPlus
::
Snapshot
();
}
void
DebuggerManager
::
abortDebugger
()
{
if
(
d
->
m_engine
&&
state
()
!=
DebuggerNotReady
)
d
->
m_engine
->
abortDebugger
();
d
->
m_codeModelSnapshot
=
CPlusPlus
::
Snapshot
();
}
DebuggerStartParametersPtr
DebuggerManager
::
startParameters
()
const
{
return
d
->
m_startParameters
;
...
...
src/plugins/debugger/debuggermanager.h
View file @
d8cc842d
...
...
@@ -201,6 +201,7 @@ public:
public
slots
:
void
startNewDebugger
(
const
DebuggerStartParametersPtr
&
sp
);
void
exitDebugger
();
void
abortDebugger
();
void
setSimpleDockWidgetArrangement
(
const
QString
&
activeLanguage
);
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
d8cc842d
...
...
@@ -1714,6 +1714,13 @@ void GdbEngine::exitDebugger() // called from the manager
shutdown
();
}
void
GdbEngine
::
abortDebugger
()
// called from the manager
{
disconnectDebuggingHelperActions
();
shutdown
();
m_gdbProc
.
kill
();
}
int
GdbEngine
::
currentFrame
()
const
{
return
manager
()
->
stackHandler
()
->
currentIndex
();
...
...
src/plugins/debugger/gdb/gdbengine.h
View file @
d8cc842d
...
...
@@ -109,6 +109,7 @@ private: ////////// General Interface //////////
virtual
void
startDebugger
(
const
DebuggerStartParametersPtr
&
sp
);
virtual
unsigned
debuggerCapabilities
()
const
;
virtual
void
exitDebugger
();
virtual
void
abortDebugger
();
virtual
void
detachDebugger
();
virtual
void
shutdown
();
...
...
src/plugins/debugger/idebuggerengine.h
View file @
d8cc842d
...
...
@@ -74,6 +74,7 @@ public:
virtual
void
setToolTipExpression
(
const
QPoint
&
mousePos
,
TextEditor
::
ITextEditor
*
editor
,
int
cursorPos
)
=
0
;
virtual
void
startDebugger
(
const
DebuggerStartParametersPtr
&
startParameters
)
=
0
;
virtual
void
exitDebugger
()
=
0
;
virtual
void
abortDebugger
()
{
exitDebugger
();
}
virtual
void
detachDebugger
()
{}
virtual
void
updateWatchData
(
const
WatchData
&
data
)
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment