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

Tests: Fixup test expectations

Browse Source 
Amends b64863806f.

Change-Id: I8df23cc10d71760cacb03eb59b728400a4ef3c61
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2021-09-28 15:02:25 +02:00
parent a6702d5a2d
commit 430c48ac1a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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