Commit 693013fa authored by hjk's avatar hjk

debugger: fix recent regression in partially anonymous structures

parent 98a0663e
......@@ -1190,7 +1190,7 @@ class Dumper:
# Anonymous union. We need a dummy name to distinguish
# multiple anonymous unions in the struct.
anonNumber += 1
self.listAnonymous(item, "#%d" % anonNumber, type)
self.listAnonymous(item, "#%d" % anonNumber, field.type)
else:
# Named field.
self.beginHash()
......
......@@ -558,8 +558,8 @@ def qdump__QObject(d, item):
#warn("OBJECT: %s " % item.value)
staticMetaObject = item.value["staticMetaObject"]
#warn("SMO: %s " % staticMetaObject)
privateType = gdb.lookup_type(d.ns + "QObjectPrivate")
d_ptr = item.value["d_ptr"]["d"].dereference().cast(privateType)
privateType = gdb.lookup_type(d.ns + "QObjectPrivate").pointer()
d_ptr = item.value["d_ptr"]["d"].cast(privateType).dereference()
#warn("D_PTR: %s " % d_ptr)
objectName = d_ptr["objectName"]
#warn("OBJECTNAME: %s " % objectName)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment