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
49296ae1
Commit
49296ae1
authored
Aug 23, 2010
by
hjk
Browse files
debugger: fix merge errors
parent
46a1c260
Changes
2
Hide whitespace changes
Inline
Side-by-side
share/qtcreator/gdbmacros/dumper.py
View file @
49296ae1
...
...
@@ -866,6 +866,7 @@ class Item:
qqFormats
=
{}
qqDumpers
=
{}
qqNs
=
""
qqQObjectCache
=
{}
class
SetupCommand
(
gdb
.
Command
):
...
...
@@ -1134,6 +1135,24 @@ class Dumper:
#print('data=[' + locals + sep + watchers + '],bkpts=[' + breakpoints + ']\n')
def
checkForQObjectBase
(
self
,
type
):
if
type
.
code
!=
gdb
.
TYPE_CODE_STRUCT
:
return
False
name
=
str
(
type
)
if
name
in
qqQObjectCache
:
return
qqQObjectCache
[
name
]
if
name
==
self
.
ns
+
"QObject"
:
qqQObjectCache
[
name
]
=
True
return
True
fields
=
type
.
strip_typedefs
().
fields
()
if
len
(
fields
)
==
0
:
qqQObjectCache
[
name
]
=
False
return
False
base
=
fields
[
0
].
type
.
strip_typedefs
()
result
=
self
.
checkForQObjectBase
(
base
)
qqQObjectCache
[
name
]
=
result
return
result
def
handleWatch
(
self
,
exp
,
iname
):
exp
=
str
(
exp
)
...
...
share/qtcreator/gdbmacros/gdbmacros.py
View file @
49296ae1
...
...
@@ -704,8 +704,6 @@ def qdump__QObject(d, item):
# Static properties.
propertyData
=
metaData
[
7
]
for
i
in
xrange
(
staticPropertyCount
):
for
property
in
xrange
(
propertyCount
):
with
SubItem
(
d
):
offset
=
propertyData
+
3
*
i
propertyName
=
extractCString
(
metaStringData
,
metaData
[
offset
])
...
...
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