Skip to content
GitLab
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
50dc4d86
Commit
50dc4d86
authored
Nov 15, 2010
by
hjk
Browse files
debugger: update display on engine exit
parent
ef0073f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/breakhandler.cpp
View file @
50dc4d86
...
...
@@ -376,7 +376,8 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
switch
(
mi
.
column
())
{
case
0
:
if
(
role
==
Qt
::
DisplayRole
)
{
return
QString
(
"%1 - %2"
).
arg
(
id
).
arg
(
response
.
bpNumber
);
return
QString
::
number
(
id
);
//return QString("%1 - %2").arg(id).arg(response.bpNumber);
}
if
(
role
==
Qt
::
DecorationRole
)
{
if
(
data
.
isWatchpoint
())
...
...
@@ -543,8 +544,13 @@ void BreakHandler::setState(BreakpointId id, BreakpointState state)
{
Iterator
it
=
m_storage
.
find
(
id
);
QTC_ASSERT
(
it
!=
m_storage
.
end
(),
return
);
if
(
it
->
state
==
state
)
{
qDebug
()
<<
"STATE UNCHANGED: "
<<
id
<<
state
;
return
;
}
it
->
state
=
state
;
updateMarker
(
id
);
layoutChanged
();
}
DebuggerEngine
*
BreakHandler
::
engine
(
BreakpointId
id
)
const
...
...
@@ -605,15 +611,13 @@ void BreakHandler::removeBreakpoint(BreakpointId id)
Iterator
it
=
m_storage
.
find
(
id
);
QTC_ASSERT
(
it
!=
m_storage
.
end
(),
return
);
if
(
it
->
state
==
BreakpointInserted
)
{
qDebug
()
<<
"MARK AS CHANGED: "
<<
id
;
it
->
state
=
BreakpointRemoveRequested
;
QTC_ASSERT
(
it
->
engine
,
return
);
debuggerCore
()
->
synchronizeBreakpoints
();
setState
(
id
,
BreakpointRemoveRequested
);
}
else
if
(
it
->
state
==
BreakpointNew
)
{
it
->
state
=
BreakpointDead
;
cleanupBreakpoint
(
id
);
}
else
{
qDebug
()
<<
"CANNOT REMOVE IN STATE "
<<
it
->
state
;
it
->
state
=
BreakpointRemoveRequested
;
}
}
...
...
@@ -826,6 +830,7 @@ void BreakHandler::notifyBreakpointReleased(BreakpointId id)
delete
it
->
marker
;
it
->
marker
=
0
;
updateMarker
(
id
);
layoutChanged
();
}
void
BreakHandler
::
cleanupBreakpoint
(
BreakpointId
id
)
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
50dc4d86
...
...
@@ -2308,7 +2308,7 @@ void GdbEngine::handleBreakEnable(const GdbResponse &response)
{
QTC_ASSERT
(
response
.
resultClass
==
GdbResultDone
,
/**/
)
const
BreakpointId
id
=
response
.
cookie
.
toInt
();
// This should only be the
"wish"
state.
// This should only be the
requested
state.
QTC_ASSERT
(
breakHandler
()
->
isEnabled
(
id
),
/* Prevent later recursion */
);
breakHandler
()
->
ackEnabled
(
id
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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