Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
038d943f
Commit
038d943f
authored
Jul 02, 2010
by
hjk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugger: fix shutdown by pressing "[x]" in the output pane
parent
ddb424a1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
5 deletions
+19
-5
src/plugins/debugger/debuggerengine.cpp
src/plugins/debugger/debuggerengine.cpp
+1
-1
src/plugins/debugger/debuggerengine.h
src/plugins/debugger/debuggerengine.h
+1
-1
src/plugins/debugger/debuggerrunner.cpp
src/plugins/debugger/debuggerrunner.cpp
+1
-1
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/debugger/gdb/gdbengine.cpp
+15
-2
src/plugins/debugger/gdb/gdbengine.h
src/plugins/debugger/gdb/gdbengine.h
+1
-0
No files found.
src/plugins/debugger/debuggerengine.cpp
View file @
038d943f
...
...
@@ -186,7 +186,7 @@ private:
bool
CommandHandler
::
setData
(
const
QModelIndex
&
,
const
QVariant
&
value
,
int
role
)
{
QTC_ASSERT
(
m_engine
,
return
false
);
QTC_ASSERT
(
m_engine
,
qDebug
()
<<
value
<<
role
;
return
false
);
m_engine
->
handleCommand
(
role
,
value
);
return
true
;
}
...
...
src/plugins/debugger/debuggerengine.h
View file @
038d943f
...
...
@@ -251,7 +251,7 @@ public slots:
void
startSuccessful
();
void
startFailed
();
void
raiseApplication
();
void
quitDebugger
()
{
exitDebugger
();
}
virtual
void
quitDebugger
()
{
exitDebugger
();
}
// called by DebuggerRunControl
protected:
void
setState
(
DebuggerState
state
,
bool
forced
=
false
);
...
...
src/plugins/debugger/debuggerrunner.cpp
View file @
038d943f
...
...
@@ -510,7 +510,7 @@ void DebuggerRunControl::stop()
{
m_running
=
false
;
QTC_ASSERT
(
m_engine
,
return
);
m_engine
->
ex
itDebugger
();
m_engine
->
qu
itDebugger
();
}
void
DebuggerRunControl
::
debuggingFinished
()
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
038d943f
...
...
@@ -1620,7 +1620,8 @@ QString GdbEngine::cleanupFullName(const QString &fileName)
void
GdbEngine
::
shutdown
()
{
showMessage
(
_
(
"INITIATE GDBENGINE SHUTDOWN"
));
showMessage
(
_
(
"INITIATE GDBENGINE SHUTDOWN IN STATE %1, PROC: %2"
)
.
arg
(
state
()).
arg
(
gdbProc
()
->
state
()));
if
(
m_progress
)
{
m_progress
->
setProgressValue
(
90
);
m_progress
->
reportCanceled
();
...
...
@@ -1726,7 +1727,19 @@ void GdbEngine::exitDebugger()
{
disconnectDebuggingHelperActions
();
shutdown
();
//gdbProc()->kill();
}
void
GdbEngine
::
quitDebugger
()
{
// FIXME: The problem here is that the "kill" send in the shutdown()
// procedure might not receive a response anymore. So we need a way
// to force it down. On the other hand, there could be an answer,
// and regular the inferior shutdown procedure could take a while.
// And the RunControl::stop() is called synchroneously.
disconnectDebuggingHelperActions
();
shutdown
();
initializeVariables
();
setState
(
DebuggerNotReady
);
}
int
GdbEngine
::
currentFrame
()
const
...
...
src/plugins/debugger/gdb/gdbengine.h
View file @
038d943f
...
...
@@ -108,6 +108,7 @@ private: ////////// General Interface //////////
virtual
void
startDebugger
();
virtual
unsigned
debuggerCapabilities
()
const
;
virtual
void
exitDebugger
();
virtual
void
quitDebugger
();
virtual
void
detachDebugger
();
virtual
void
shutdown
();
...
...
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