diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2021-09-28 15:02:25 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2021-09-28 13:18:09 +0000 |
| commit | 430c48ac1a934a0e7c3df584b3d5fdc75dad25d9 (patch) | |
| tree | 7109812bd2d1c8c1bf5f2a2867ad25457d1ab755 | |
| parent | a6702d5a2df7836c48c222eff120a25a16059d3f (diff) | |
Tests: Fixup test expectations
Amends b64863806fdde.
Change-Id: I8df23cc10d71760cacb03eb59b728400a4ef3c61
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | tests/auto/debugger/tst_offsets.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index 88b8f08dc9..36beacd8e6 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -240,12 +240,16 @@ void tst_offsets::offsets_data() OFFSET_TEST(QFileInfoPrivate, fileEntry) << 4 << 8; // Qt5: vptr + 3 ptr + 2 int + ptr - // Qt6: vptr + objectlist + 8 unit:1 + uint:24 + int + ptr + bindingstorage + ptr - int size32 = qtVersion >= 0x60000 ? 60 : 28; - int size64 = qtVersion >= 0x60000 ? 80 : 48; + // Qt6: vptr + objectlist + 8 unit:1 + uint:24 + int + ptr + bindingstorage (+ ptr) + int size32 = qtVersion >= 0x60000 ? 56 : 28; + int size64 = qtVersion >= 0x60000 ? 72 : 48; + if (qtTypeVersion >= 21) { // the additional ptr was introduced with qtTypeVersion 21 + size32 += 4; + size64 += 8; + } QTest::newRow("sizeof(QObjectData)") << int(sizeof(QObjectData)) << size32 << size64; - if (qtVersion >= 0x50000 && qtTypeVersion < 21) + if (qtVersion >= 0x50000) OFFSET_TEST(QObjectPrivate, extraData) << size32 << size64; // sizeof(QObjectData) else OFFSET_TEST(QObjectPrivate, extraData) << size32 + 4 << size64 + 8; // sizeof(QObjectData) + 1 ptr |