Commit a9f44670 authored by David Schulz's avatar David Schulz

Debugger: Adjust python dumper for 32bit MSVC binaries

Change-Id: Ia20321da89b387d016eb7fed076002a709aae748
Reviewed-by: default avatarhjk <hjk@qt.io>
parent 26397935
......@@ -489,7 +489,10 @@ def qdump__QFile(d, value):
is32bit = d.ptrSize() == 4
if qtVersion >= 0x050600:
if d.isWindowsTarget():
offset = 164 if is32bit else 248
if d.isMsvcTarget():
offset = 184 if is32bit else 248
else:
offset = 164 if is32bit else 248
else:
offset = 168 if is32bit else 248
elif qtVersion >= 0x050500:
......@@ -752,7 +755,7 @@ def qdump__QHostAddress(d, value):
(ipString, scopeId, a4, pad, a6, protocol, isParsed) \
= d.split('{QString}{QString}{quint32}I16sI{bool}', dd)
elif qtVersion >= 0x050600: # 5.6.0 at f3aabb42
if d.ptrSize() == 8:
if d.ptrSize() == 8 or d.isMsvcTarget():
(ipString, scopeId, a4, pad, a6, protocol, isParsed) \
= d.split('{QString}{QString}{quint32}I16sI{bool}', dd)
else:
......
......@@ -149,7 +149,7 @@ void tst_offsets::offsets_data()
if (qtVersion >= 0x50600)
#ifdef Q_OS_WIN
# ifdef Q_CC_MSVC
OFFSET_TEST(QFilePrivate, fileName) << 176 << 248;
OFFSET_TEST(QFilePrivate, fileName) << 184 << 248;
# else // MinGW
OFFSET_TEST(QFilePrivate, fileName) << 164 << 248;
# endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment