summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorhjk <qthjk@ovi.com>2012-10-04 17:28:35 +0200
committerhjk <qthjk@ovi.com>2012-10-05 11:23:20 +0200
commit4265d47c78dcf4b5c81ea2d1e048294224c22e74 (patch)
tree26481e4821c4ceb232ceb0f020354c7af68c8e16 /share
parent2cc4ec031a0c3fc6c659e1a959e5927047d9b43b (diff)
downloadqt-creator-4265d47c78dcf4b5c81ea2d1e048294224c22e74.tar.gz
debugger: fix display of QObject object names for Qt 5
Change-Id: I58ad709575f4846812de3e2109112be170e8e433 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/dumper/qttypes.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/dumper/qttypes.py
index 6dad694aac..bddb2c53c9 100644
--- a/share/qtcreator/dumper/qttypes.py
+++ b/share/qtcreator/dumper/qttypes.py
@@ -721,7 +721,10 @@ def qdump__QObject(d, value):
staticMetaObject = value["staticMetaObject"]
d_ptr = value["d_ptr"]["d"].cast(privateType.pointer()).dereference()
#warn("D_PTR: %s " % d_ptr)
- objectName = d_ptr["objectName"]
+ try:
+ objectName = d_ptr["objectName"]
+ except: # Qt 5
+ objectName = d_ptr["extraData"].dereference()["objectName"]
except:
d.putPlainChildren(value)
return