From 022782d371965c9455af35915eaf87536bd6b759 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Wed, 3 Feb 2021 22:13:51 +0100 Subject: 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 (cherry picked from commit 1316af2f3ed7861d0955793261a18f8ebf237f6f) Reviewed-by: Edward Welbourne --- tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests') 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("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(); // GUI types are tested in tst_QGuiMetaType. -- cgit v1.2.3