aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-03-27 17:41:16 +0100
committerhjk <hjk121@nokiamail.com>2014-04-01 12:38:55 +0200
commit7932a9ddbc045b0ef3159f9873148d29efae4bf0 (patch)
tree595cb96009123c3523ff516c78bceecc7dab9bb6 /share
parent17fd00b609ed26013f0934d639fb531f600fe6a7 (diff)
Debugger: More robust metaobject extraction
Change-Id: I359cbdcfb0594b988e041c06efa44c6fd85a8d65 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/debugger/dumper.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 1d9ba5302f..89c3b7b43d 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -955,7 +955,7 @@ class DumperBase:
superdata = self.extractPointer(result)
if toInteger(superdata) == 0:
# This looks like a Q_GADGET
- result = 0
+ return 0
return result
@@ -971,7 +971,15 @@ class DumperBase:
if result is not None: # Is 0 or the static metaobject.
return result
- result = self.extractStaticMetaObjectHelper(typeobj)
+ try:
+ result = self.extractStaticMetaObjectHelper(typeobj)
+ except RuntimeError as error:
+ warn("METAOBJECT EXTRACTION FAILED: %s" % error)
+ result = 0
+ except:
+ warn("METAOBJECT EXTRACTION FAILED FOR UNKNOWN REASON")
+ result = 0
+
if not result:
base = self.directBaseClass(typeobj, 0)
if base: