diff options
| author | hjk <hjk@qt.io> | 2019-07-30 15:07:28 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-07-31 07:28:02 +0000 |
| commit | b2daf07573b2813b849faaaeedfbfa4ac28afca5 (patch) | |
| tree | 4291998d572c41a6d87099a78b6fedc969036044 /tests/auto | |
| parent | 2ec58eac25e2c58b84d96ada85ef727d4a6685ef (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 'tests/auto')
| -rw-r--r-- | tests/auto/debugger/tst_offsets.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index 4e31217304..90d1cfa3ef 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -144,6 +144,10 @@ void tst_offsets::offsets() QCOMPARE(actual, expect); } +QT_BEGIN_NAMESPACE +extern quintptr Q_CORE_EXPORT qtHookData[]; +QT_END_NAMESPACE + void tst_offsets::offsets_data() { QTest::addColumn<int>("actual"); @@ -151,8 +155,19 @@ void tst_offsets::offsets_data() QTest::addColumn<int>("expected64"); const int qtVersion = QT_VERSION; + const quintptr qtTypeVersion = qtHookData[6]; - if (qtVersion >= 0x50700) + if (qtVersion > 0x50600 && qtTypeVersion >= 17) +#ifdef Q_OS_WIN +# ifdef Q_CC_MSVC + OFFSET_TEST(QFilePrivate, fileName) << 164 << 224; +# else // MinGW + OFFSET_TEST(QFilePrivate, fileName) << 160 << 224; +# endif +#else + OFFSET_TEST(QFilePrivate, fileName) << 156 << 224; +#endif + else if (qtVersion >= 0x50700) #ifdef Q_OS_WIN # ifdef Q_CC_MSVC OFFSET_TEST(QFilePrivate, fileName) << 176 << 248; |