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

QVariant benchmark: fix crashes

Browse Source 
- Skip unused metatype id
- Do not construct a QVariant from an int, when we instead want to
  construct a QVariant for a given metatype (was: metatype id in Qt 5)

Pick-to: 6.0
Change-Id: I1ac19dec5549b424a9429f69999eaf8e96c022e2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fabian Kosmale 2021-01-26 12:43:25 +01:00
parent d3735ff838
commit 6d3a886f09
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp
View File

@ -336,8 +336,10 @@ void tst_qvariant::stringVariantValue()
void tst_qvariant::createCoreType_data() void tst_qvariant::createCoreType_data()
{ {
QTest::addColumn<int>("typeId"); QTest::addColumn<int>("typeId");
for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) {
QTest::newRow(QMetaType::typeName(i)) << i; if (QMetaType::typeName(i)) // QMetaType(27) does not exist
QTest::newRow(QMetaType::typeName(i)) << i;
}
} }
// Tests how fast a Qt core type can be default-constructed by a // Tests how fast a Qt core type can be default-constructed by a
@ -365,11 +367,12 @@ void tst_qvariant::createCoreTypeCopy_data()
void tst_qvariant::createCoreTypeCopy() void tst_qvariant::createCoreTypeCopy()
{ {
QFETCH(int, typeId); QFETCH(int, typeId);
QVariant other(typeId); QMetaType metaType(typeId);
QVariant other(metaType);
const void *copy = other.constData(); const void *copy = other.constData();
QBENCHMARK { QBENCHMARK {
for (int i = 0; i < ITERATION_COUNT; ++i) for (int i = 0; i < ITERATION_COUNT; ++i)
QVariant(QMetaType(typeId), copy); QVariant(metaType, copy);
} }
} }