Commit 52e1894d authored by hjk's avatar hjk
Browse files

debugger: fix merge

parent b59fa0cd
...@@ -864,6 +864,7 @@ class Item: ...@@ -864,6 +864,7 @@ class Item:
# This is a mapping from 'type name' to 'display alternatives'. # This is a mapping from 'type name' to 'display alternatives'.
qqFormats = {} qqFormats = {}
qqDumpers = {}
qqNs = "" qqNs = ""
......
...@@ -631,6 +631,7 @@ def qdump__QObject(d, item): ...@@ -631,6 +631,7 @@ def qdump__QObject(d, item):
d.putNumChild(4) d.putNumChild(4)
if d.isExpanded(item): if d.isExpanded(item):
with Children(d): with Children(d):
d.putFields(item)
# Parent and children. # Parent and children.
if stripClassTag(str(item.value.type)) == d.ns + "QObject": if stripClassTag(str(item.value.type)) == d.ns + "QObject":
d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent")) d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))
......
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