From 9fda5c4ac072e1a7dc9169b4c0aaee7e68c7144a Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 1 Dec 2020 09:22:09 +0100 Subject: [PATCH] Bump the type info version in qhooks.cpp And correct the comment in tst_toolsupport. Amends change d99fdf17842d914daa41124184c6531c92766cd0. Change-Id: I94e296f5bb5b57132c887072efb0bb56aafc524f Reviewed-by: Fabian Kosmale (cherry picked from commit 95730dd19cddd65588c902255513517556afc49f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qhooks.cpp | 2 +- tests/auto/other/toolsupport/tst_toolsupport.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qhooks.cpp b/src/corelib/global/qhooks.cpp index c3a625bb5fa..491e126b7a1 100644 --- a/src/corelib/global/qhooks.cpp +++ b/src/corelib/global/qhooks.cpp @@ -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])); diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp index bd6cc8b2938..0bcadbe27fd 100644 --- a/tests/auto/other/toolsupport/tst_toolsupport.cpp +++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp @@ -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