aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/debugger
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-07-30 15:07:28 +0200
committerhjk <hjk@qt.io>2019-07-31 07:28:02 +0000
commitb2daf07573b2813b849faaaeedfbfa4ac28afca5 (patch)
tree4291998d572c41a6d87099a78b6fedc969036044 /share/qtcreator/debugger
parent2ec58eac25e2c58b84d96ada85ef727d4a6685ef (diff)
Debugger: Fix QFileDumper
Some QRingBuffer member got removed in 8f92baf5c9. Change-Id: Ie0066db3b61bff25751a4886cb4b584cc4db49bf Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'share/qtcreator/debugger')
-rw-r--r--share/qtcreator/debugger/qttypes.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 317b3d343a..44f151c9c6 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -603,7 +603,16 @@ def qdump__QFile(d, value):
# 9fc0965 and a373ffcd change the layout of the private structure
qtVersion = d.qtVersion()
is32bit = d.ptrSize() == 4
- if qtVersion >= 0x050700:
+ if qtVersion >= 0x050600 and d.qtTypeInfoVersion() >= 17:
+ # Some QRingBuffer member got removed in 8f92baf5c9
+ if d.isWindowsTarget():
+ if d.isMsvcTarget():
+ offset = 164 if is32bit else 224
+ else:
+ offset = 160 if is32bit else 224
+ else:
+ offset = 156 if is32bit else 224
+ elif qtVersion >= 0x050700:
if d.isWindowsTarget():
if d.isMsvcTarget():
offset = 176 if is32bit else 248