diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-11-27 13:48:11 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-12-03 10:38:43 +0100 |
| commit | 77c02343e2c86bd80994882d709fe12f745705ba (patch) | |
| tree | 214ae179c7d62f4328aaf75b6447e08c5a5c7d32 /tests/auto/qml/qqmlvaluetypes | |
| parent | 76aa1d578d0eb0e819bac34292f2788853dc5199 (diff) | |
Use QMetaType instead of metatype-id, take 2
This time, the ValueTypeFactory gets converted. As a consequence, many
callers get touched again.
Task-number: QTBUG-88766
Change-Id: I3a8b7d5cfeb7fac85daf1702febba205971d4256
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlvaluetypes')
| -rw-r--r-- | tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp index cf6ed273af..f615060ce3 100644 --- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp +++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp @@ -1823,8 +1823,8 @@ void tst_qqmlvaluetypes::scarceTypes() // These should not be treated as value types because we want the scarce resource // mechanism to clear them when going out of scope. The scarce resource mechanism // only works on QV4::VariantObject as that has an additional level of redirection. - QVERIFY(!QQmlValueTypeFactory::isValueType(qMetaTypeId<QImage>())); - QVERIFY(!QQmlValueTypeFactory::isValueType(qMetaTypeId<QPixmap>())); + QVERIFY(!QQmlValueTypeFactory::isValueType(QMetaType::fromType<QImage>())); + QVERIFY(!QQmlValueTypeFactory::isValueType(QMetaType::fromType<QPixmap>())); QV4::ExecutionEngine engine; QV4::Scope scope(&engine); @@ -1839,7 +1839,7 @@ void tst_qqmlvaluetypes::scarceTypes() } #define CHECK_TYPE_IS_NOT_VALUETYPE(Type, typeId, cppType) \ - QVERIFY(!QQmlValueTypeFactory::isValueType(QMetaType::Type)); + QVERIFY(!QQmlValueTypeFactory::isValueType(QMetaType(QMetaType::Type))); void tst_qqmlvaluetypes::nonValueTypes() { |