diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-01 09:22:09 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-12-01 09:53:02 +0100 |
commit | 95730dd19cddd65588c902255513517556afc49f (patch) | |
tree | a82385462f2069534a75a914278bdb5d31f9847b | |
parent | 65e2837b30becb745036f13d98a9472a0332b152 (diff) |
-rw-r--r-- | src/corelib/global/qhooks.cpp | 2 | ||||
-rw-r--r-- | 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 c3a625bb5f..491e126b7a 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 bd6cc8b293..0bcadbe27f 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 |