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
7c823c6a
Commit
7c823c6a
authored
Feb 01, 2010
by
hjk
Browse files
debugger: prevent overwriting a correctly parsed file name for breakpoints.
parent
42c66a8b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/gdbengine.cpp
View file @
7c823c6a
...
...
@@ -1972,10 +1972,11 @@ void GdbEngine::breakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt
data
->
markerFileName
=
name
;
}
else
{
name
=
QFile
::
decodeName
(
file
);
// Use fullName() once we have a mapping which is more complete than
gdb's own ...
// No point in assigning markerFileName for now.
// Use fullName() once we have a mapping which is more complete than
//
gdb's own.
No point in assigning markerFileName for now.
}
data
->
bpFileName
=
name
;
if
(
!
name
.
isEmpty
())
data
->
bpFileName
=
name
;
}
QString
GdbEngine
::
breakLocation
(
const
QString
&
file
)
const
...
...
@@ -2204,10 +2205,11 @@ void GdbEngine::handleBreakInfo(const GdbResponse &response)
BreakHandler
*
handler
=
manager
()
->
breakHandler
();
if
(
response
.
resultClass
==
GdbResultDone
)
{
// Old-style output for multiple breakpoints, presumably in a
// constructor
// constructor
.
int
found
=
handler
->
findBreakpoint
(
bpNumber
);
if
(
found
!=
-
1
)
{
QString
str
=
QString
::
fromLocal8Bit
(
response
.
data
.
findChild
(
"consolestreamoutput"
).
data
());
QString
str
=
QString
::
fromLocal8Bit
(
response
.
data
.
findChild
(
"consolestreamoutput"
).
data
());
extractDataFromInfoBreak
(
str
,
handler
->
at
(
found
));
attemptBreakpointSynchronization
();
// trigger "ready"
}
...
...
@@ -2308,8 +2310,8 @@ void GdbEngine::attemptBreakpointSynchronization()
for
(
int
index
=
0
;
index
!=
handler
->
size
();
++
index
)
{
BreakpointData
*
data
=
handler
->
at
(
index
);
if
(
data
->
bpNumber
.
isEmpty
())
{
//
u
nset breakpoint?
data
->
bpNumber
=
" "
;
// Sent, but no feedback yet
if
(
data
->
bpNumber
.
isEmpty
())
{
//
U
nset breakpoint?
data
->
bpNumber
=
" "
;
// Sent, but no feedback yet
.
sendInsertBreakpoint
(
index
);
}
else
if
(
data
->
bpNumber
.
toInt
())
{
if
(
data
->
bpMultiple
&&
data
->
bpFileName
.
isEmpty
())
{
...
...
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