summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-02-03 22:13:51 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2021-03-15 08:33:58 +0000
commit3858d1e913ef3c9c1e970fff9d0bc0e639982e78 (patch)
tree9dd5600e3fdeaf9294468d4162c6c5422d54fc9c /tests
parent0f7d433d6dcaf8b7c52b8cc00fdf010bb2f5d4d7 (diff)
Fix QMetaType benchmark
The benchmark used to crash because QMetaType::typeName would return an empty string, which is not a legal value for newRow. Change-Id: I9e6c6c1cf153943bfa21181cd2cca596a7943ea0 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1316af2f3ed7861d0955793261a18f8ebf237f6f) Fixes: QTBUG-91711
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
index abeaa79f26..126af8adde 100644
--- a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -248,9 +248,11 @@ void tst_QMetaType::isRegisteredNotRegistered()
void tst_QMetaType::constructInPlace_data()
{
QTest::addColumn<int>("typeId");
- for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i)
- if (i != QMetaType::Void)
- QTest::newRow(QMetaType::typeName(i)) << i;
+ for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) {
+ auto name = QMetaType::typeName(i);
+ if (name && i != QMetaType::Void)
+ QTest::newRow(name) << i;
+ }
QTest::newRow("custom") << qMetaTypeId<BigClass>();
// GUI types are tested in tst_QGuiMetaType.