1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump the type info version in qhooks.cpp

Browse Source 
And correct the comment in tst_toolsupport.

Amends change d99fdf17842d914daa41124184c6531c92766cd0.

Change-Id: I94e296f5bb5b57132c887072efb0bb56aafc524f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 95730dd19cddd65588c902255513517556afc49f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lars Knoll 2020-12-01 09:22:09 +01:00 committed by Qt Cherry-pick Bot
parent 455d009a60
commit 9fda5c4ac0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qhooks.cpp
View File

@ -67,7 +67,7 @@ quintptr Q_CORE_EXPORT qtHookData[] = {
// The required sizes and offsets are tested in tests/auto/other/toolsupport. // The required sizes and offsets are tested in tests/auto/other/toolsupport.
// When this fails and the change was intentional, adjust the test and // When this fails and the change was intentional, adjust the test and
// adjust this value here. // adjust this value here.
20 21
}; };
static_assert(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0])); static_assert(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0]));

2
tests/auto/other/toolsupport/tst_toolsupport.cpp
View File

@ -97,7 +97,7 @@ void tst_toolsupport::offsets_data()
{ {
QTestData &data = QTest::newRow("sizeof(QObjectData)") QTestData &data = QTest::newRow("sizeof(QObjectData)")
<< 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 #if RUN_MEMBER_OFFSET_TEST