AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1616403477

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-22 11:33:17 +00:00
commit b3544bfd46
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,12 +101,14 @@ void tst_toolsupport::offsets_data()
{
QTestData &data = QTest::newRow("sizeof(QObjectData)")
<< sizeof(QObjectData);
// Please heed the comment at the top of this file when changing this line:
data << 44 << 80; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr
}
{
QTestData &data = QTest::newRow("sizeof(QObjectPrivate::ExtraData)")
<< sizeof(QObjectPrivate::ExtraData);
// Please heed the comment at the top of this file when changing this line:
data << 60 << 120; // 4 * QList + 1 * QString
}
@ -114,18 +116,21 @@ void tst_toolsupport::offsets_data()
{
QTestData &data = QTest::newRow("QObjectPrivate::extraData")
<< pmm_to_offsetof(&QObjectPrivate::extraData);
// Please heed the comment at the top of this file when changing this line:
data << 44 << 80; // sizeof(QObjectData)
}
{
QTestData &data = QTest::newRow("QFileInfoPrivate::fileEntry")
<< pmm_to_offsetof(&QFileInfoPrivate::fileEntry);
// Please heed the comment at the top of this file when changing this line:
data << 4 << 8;
}
{
QTestData &data = QTest::newRow("QFileSystemEntry::filePath")
<< pmm_to_offsetof(&QFileSystemEntry::m_filePath);
// Please heed the comment at the top of this file when changing this line:
data << 0 << 0;
}
@ -133,6 +138,7 @@ void tst_toolsupport::offsets_data()
{
QTestData &data = QTest::newRow("QFilePrivate::fileName")
<< pmm_to_offsetof(&QFilePrivate::fileName);
// Please heed the comment at the top of this file when changing one of these lines:
#ifdef Q_PROCESSOR_X86
// x86 32-bit has weird alignment rules. Refer to QtPrivate::AlignOf in
// qglobal.h for more details.
@ -144,6 +150,7 @@ void tst_toolsupport::offsets_data()
#endif
{
// Please heed the comment at the top of this file when changing one of these lines:
QTest::newRow("QDateTimePrivate::m_msecs")
<< pmm_to_offsetof(&QDateTimePrivate::m_msecs) << 8 << 8;
QTest::newRow("QDateTimePrivate::m_status")