aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@digia.com>2014-04-03 11:20:15 +0200
committerhjk <hjk121@nokiamail.com>2014-04-03 12:13:08 +0200
commiteabf4628c93dfeb6ee8a86b99182fdabbf71e286 (patch)
tree96d07c67eb6c28ac14a812193d1545c95eaf3f10 /share
parent19d464dd72f3058810de186bfd2a1586adcb9a22 (diff)
Debugger: Use tested offsets in QFile dumper
Change-Id: I6c45d9ebcfa7705ba0913cd1c3ff30798758c473 Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/debugger/qttypes.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 760dded9df..0b7a6f553d 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -409,12 +409,19 @@ def qdump__QDir(d, value):
def qdump__QFile(d, value):
# 9fc0965 changes the layout of the private structure
qtVersion = d.qtVersion()
- if qtVersion >= 0x050200:
- offset = 176 if d.is32bit() else 272
+ is32bit = d.is32bit()
+ if qtVersion > 0x050200:
+ if d.isWindowsTarget():
+ offset = 180 if is32bit else 272
+ else:
+ offset = 176 if is32bit else 272
elif qtVersion >= 0x050000:
- offset = 180 if d.is32bit() else 280
+ offset = 176 if is32bit else 280
else:
- offset = 140 if d.is32bit() else 232
+ if d.isWindowsTarget():
+ offset = 144 if is32bit else 232
+ else:
+ offset = 140 if is32bit else 232
privAddress = d.extractPointer(d.addressOf(value) + d.ptrSize())
fileNameAddress = privAddress + offset
d.putStringValueByAddress(fileNameAddress)