diff options
| author | David Schulz <david.schulz@qt.io> | 2017-03-14 12:22:29 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2017-03-21 09:04:41 +0000 |
| commit | f32b1d00f41aefeb4318158648cd1c84c06f580f (patch) | |
| tree | 626b4f8e2cdc18b49f2e37d57c27621e6cd02fb0 | |
| parent | 33e8f2e09933815aa8dc731dd49090828e57b2c2 (diff) | |
| download | qt-creator-f32b1d00f41aefeb4318158648cd1c84c06f580f.tar.gz | |
Debugger: Adjust offset for QFile dumper
Change-Id: I20704cdcdda1273cdc0df91bf963c979a1f51190
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | share/qtcreator/debugger/qttypes.py | 12 | ||||
| -rw-r--r-- | tests/auto/debugger/tst_offsets.cpp | 14 |
2 files changed, 22 insertions, 4 deletions
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 0877634a3c..69443b6cdc 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -487,12 +487,20 @@ def qdump__QFile(d, value): # 9fc0965 and a373ffcd change the layout of the private structure qtVersion = d.qtVersion() is32bit = d.ptrSize() == 4 - if qtVersion >= 0x050600: + if qtVersion >= 0x050700: if d.isWindowsTarget(): if d.isMsvcTarget(): offset = 184 if is32bit else 248 else: - offset = 164 if is32bit else 248 + offset = 172 if is32bit else 248 + else: + offset = 168 if is32bit else 248 + elif qtVersion >= 0x050600: + if d.isWindowsTarget(): + if d.isMsvcTarget(): + offset = 184 if is32bit else 248 + else: + offset = 180 if is32bit else 248 else: offset = 168 if is32bit else 248 elif qtVersion >= 0x050500: diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index ee39d08a76..11009cd802 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -146,12 +146,22 @@ void tst_offsets::offsets_data() const int qtVersion = QT_VERSION; - if (qtVersion >= 0x50600) + if (qtVersion >= 0x50700) #ifdef Q_OS_WIN # ifdef Q_CC_MSVC OFFSET_TEST(QFilePrivate, fileName) << 184 << 248; # else // MinGW - OFFSET_TEST(QFilePrivate, fileName) << 164 << 248; + OFFSET_TEST(QFilePrivate, fileName) << 172 << 248; +# endif +#else + OFFSET_TEST(QFilePrivate, fileName) << 168 << 248; +#endif + else if (qtVersion >= 0x50600) +#ifdef Q_OS_WIN +# ifdef Q_CC_MSVC + OFFSET_TEST(QFilePrivate, fileName) << 184 << 248; +# else // MinGW + OFFSET_TEST(QFilePrivate, fileName) << 180 << 248; # endif #else OFFSET_TEST(QFilePrivate, fileName) << 168 << 248; |