Commit 95730dd1 authored by Lars Knoll's avatar Lars Knoll

Bump the type info version in qhooks.cpp

And correct the comment in tst_toolsupport.

Amends change d99fdf17.

Pick-to: 6.0 dev
Change-Id: I94e296f5bb5b57132c887072efb0bb56aafc524f
Reviewed-by: default avatarFabian Kosmale <fabian.kosmale@qt.io>
parent 65e2837b
......@@ -67,7 +67,7 @@ quintptr Q_CORE_EXPORT qtHookData[] = {
// The required sizes and offsets are tested in tests/auto/other/toolsupport.
// When this fails and the change was intentional, adjust the test and
// adjust this value here.
20
21
};
static_assert(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0]));
......
......@@ -97,7 +97,7 @@ void tst_toolsupport::offsets_data()
{
QTestData &data = QTest::newRow("sizeof(QObjectData)")
<< sizeof(QObjectData);
data << 44 << 80; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr
data << 44 << 80; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr + 2*ptr
}
#if RUN_MEMBER_OFFSET_TEST
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment