forked from qt-creator/qt-creator
debugger: fix merge
This commit is contained in:
@@ -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):
|
|||||||
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"))
|
||||||
|
Reference in New Issue
Block a user