From 1fba1858825ae60644c5bc5d75b6cc9fd5550c2b Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 18 Aug 2010 10:12:03 +0200
Subject: [PATCH] debugger: fix merge
---
share/qtcreator/gdbmacros/gdbmacros.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index 295dd4e3ff1..1cba34f289c 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -614,6 +614,8 @@ def qdump__QObject(d, item):
d.putNumChild(4)
if d.isExpanded(item):
with Children(d):
+ d.putFields(item)
+
# Parent and children.
d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))
d.putItem(Item(d_ptr["children"], item.iname, "children", "children"))
--
GitLab