feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Adjust python dumper for 32bit MSVC binaries

Browse Source 
Change-Id: Ia20321da89b387d016eb7fed076002a709aae748
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2017-02-07 09:53:15 +01:00
parent 26397935b4
commit a9f446704f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/qtcreator/debugger/qttypes.py
View File

@@ -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:

2
tests/auto/debugger/tst_offsets.cpp
View File

@@ -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