summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-08-13 14:50:39 +0200
committerhjk <qtc-committer@nokia.com>2010-08-13 15:01:07 +0200
commitddd3e8b1c9b4eb9d36c05ba0b1bae2faaffb2cf2 (patch)
tree3c11943cff511dbb85eddd517c2b5b8bd2eb0ee6
parentc33624f3d1a1698d041d8a00aef3f45e865955f0 (diff)
downloadqt-creator-ddd3e8b1c9b4eb9d36c05ba0b1bae2faaffb2cf2.tar.gz
Debugger[Python]: Deactivate QObject-Properties temporarily
due to it causing Windows gdb to crash. Reviewed-by: hjk (cherry picked from commit faa38be87c9a9afc0ddc7672b655521ac829bb5f)
-rw-r--r--share/qtcreator/gdbmacros/dumper.py10
-rw-r--r--share/qtcreator/gdbmacros/gdbmacros.py1
2 files changed, 1 insertions, 10 deletions
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index d665f51716..bd8bd1b944 100644
--- a/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@ -1328,11 +1328,7 @@ class Dumper:
typedefStrippedType).replace("::", "__")
# Is this derived from QObject?
- try:
- item.value['staticMetaObject']
- hasMetaObject = True
- except:
- hasMetaObject = False
+ hasMetaObject = False
#warn(" STRIPPED: %s" % nsStrippedType)
#warn(" DUMPERS: %s" % self.dumpers)
@@ -1344,10 +1340,6 @@ class Dumper:
self.putValue(value)
self.putNumChild(0)
- elif hasMetaObject and self.useFancy:
- self.putType(item.value.type)
- qdump__QObject(self, item)
-
elif nsStrippedType in self.dumpers:
#warn("IS DUMPABLE: %s " % type)
self.putType(item.value.type)
diff --git a/share/qtcreator/gdbmacros/gdbmacros.py b/share/qtcreator/gdbmacros/gdbmacros.py
index 49906fe75c..4394e630af 100644
--- a/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@ -614,7 +614,6 @@ 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"))