diff options
Diffstat (limited to 'tests')
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 001749e88e..ccdab17668 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -3542,6 +3542,7 @@ void tst_QVariant::loadQVariantFromDataStream(QDataStream::Version version) stream >> typeName >> loadedVariant; const int id = QMetaType::type(typeName.toLatin1()); + QVariant constructedVariant(static_cast<QVariant::Type>(id)); QCOMPARE(constructedVariant.userType(), id); QCOMPARE(QMetaType::typeName(loadedVariant.userType()), typeName.toLatin1().constData()); @@ -3616,7 +3617,7 @@ void tst_QVariant::debugStream_data() { QTest::addColumn<QVariant>("variant"); QTest::addColumn<int>("typeId"); - for (int id = QMetaType::Void; id < QMetaType::User; ++id) { + for (int id = 0; id < QMetaType::User; ++id) { const char *tagName = QMetaType::typeName(id); if (!tagName) continue; diff --git a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp index 14895863e4..1c5dc9227f 100644 --- a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -240,7 +240,7 @@ void tst_QMetaType::isRegisteredNotRegistered() void tst_QMetaType::constructCoreType_data() { QTest::addColumn<int>("typeId"); - for (int i = 0; i <= QMetaType::LastCoreType; ++i) + for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) QTest::newRow(QMetaType::typeName(i)) << i; // GUI types are tested in tst_QGuiMetaType. } diff --git a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp index 0c4af17376..e842e18d52 100644 --- a/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/benchmarks/corelib/kernel/qvariant/tst_qvariant.cpp @@ -305,7 +305,7 @@ void tst_qvariant::stringVariantValue() void tst_qvariant::createCoreType_data() { QTest::addColumn<int>("typeId"); - for (int i = 0; i <= QMetaType::LastCoreType; ++i) + for (int i = QMetaType::FirstCoreType; i <= QMetaType::LastCoreType; ++i) QTest::newRow(QMetaType::typeName(i)) << i; } |