aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/debugger
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-07-30 15:48:46 +0200
committerhjk <hjk@qt.io>2019-07-31 08:10:21 +0000
commitbe67ee75c5bd8b537c578ec024722374b472f9fd (patch)
tree6538cf1b0b7e20f944a07e69979f98c0523e82b4 /share/qtcreator/debugger
parentb2daf07573b2813b849faaaeedfbfa4ac28afca5 (diff)
Debugger: Fix QStandardItem dumper for Qt >= 5.9
Change-Id: Ib0dab191705982cf92d9599b8e627b41f0e187cc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'share/qtcreator/debugger')
-rw-r--r--share/qtcreator/debugger/qttypes.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 44f151c9c6..864b229953 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -227,7 +227,9 @@ def qdump__QStandardItemData(d, value):
def qdump__QStandardItem(d, value):
vtable, dptr = value.split('pp')
- if d.isMsvcTarget():
+ # There used to be a virtual destructor that got removed in
+ # 88b6abcebf29b455438 on Apr 18 17:01:22 2017
+ if d.qtVersion() >= 0x050900 or d.isMsvcTarget():
model, parent, values, children, rows, cols, item = d.split('ppPPIIp', dptr)
else:
vtable1, model, parent, values, children, rows, cols, item = d.split('pppPPIIp', dptr)