From ddd3e8b1c9b4eb9d36c05ba0b1bae2faaffb2cf2 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 13 Aug 2010 14:50:39 +0200
Subject: [PATCH] Debugger[Python]: Deactivate QObject-Properties temporarily
due to it causing Windows gdb to crash.
Reviewed-by: hjk
(cherry picked from commit faa38be87c9a9afc0ddc7672b655521ac829bb5f)
---
share/qtcreator/gdbmacros/dumper.py | 10 +---------
share/qtcreator/gdbmacros/gdbmacros.py | 1 -
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py
index d665f517168..bd8bd1b9448 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 49906fe75cb..4394e630afb 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"))
--
GitLab