From 52e1894df4d066f1e24a808650265f9f5438d4e8 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 18 Aug 2010 10:07:54 +0200
Subject: [PATCH] debugger: fix merge

---
 share/qtcreator/gdbmacros/dumper.py    | 1 +
 share/qtcreator/gdbmacros/gdbmacros.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index 6278d20fce6..5eddd208eb2 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -864,6 +864,7 @@ class Item:
 # This is a mapping from 'type name' to 'display alternatives'.
 
 qqFormats = {}
+qqDumpers = {}
 qqNs = ""
 
 
diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index 00f0f923cbd..1a912257161 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -631,6 +631,7 @@ def qdump__QObject(d, item):
     d.putNumChild(4)
     if d.isExpanded(item):
       with Children(d):
+        d.putFields(item)
         # Parent and children.
         if stripClassTag(str(item.value.type)) == d.ns + "QObject":
             d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))