Handle changes in QMetaType API

Updates to support building with Qt6 and Qt5.15

Change-Id: I9f06d810c943a348e6a060f4ea35ed870f21694a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

2 files changed, 21 insertions, 4 deletions

diff --git a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp
index 751aa814a..e57829b74 100644
--- a/tests/auto/render/gltfplugins/tst_gltfplugins.cpp
+++ b/tests/auto/render/gltfplugins/tst_gltfplugins.cpp
@@ -789,15 +789,24 @@ void tst_gltfPlugins::compareComponents(Qt3DCore::QComponent *c1, Qt3DCore::QCom
                 auto property = c1->metaObject()->property(i);
                 auto v1 = c1->property(property.name());
                 auto v2 = c2->property(property.name());
-                if (v1.metaType().id() == QMetaType::Bool) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+                const auto v1TypeId = v1.metaType().id();
+#else
+                const auto v1TypeId = v1.type();
+#endif
+                if (v1TypeId == QMetaType::Bool) {
                     QCOMPARE(v1.toBool(), v2.toBool());
-                } else if (v1.metaType().id() == QMetaType::QColor) {
+                } else if (v1TypeId == QMetaType::QColor) {
                     QCOMPARE(v1.value<QColor>(), v2.value<QColor>());
-                } else if (v1.metaType().id() == QMetaType::QVector3D) {
+                } else if (v1TypeId == QMetaType::QVector3D) {
                     QCOMPARE(v1.value<QVector3D>(), v2.value<QVector3D>());
-                } else if (v1.metaType().id() == QMetaType::QMatrix4x4) {
+                } else if (v1TypeId == QMetaType::QMatrix4x4) {
                     QCOMPARE(v1.value<QMatrix4x4>(), v2.value<QMatrix4x4>());
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
                 } else if (QMetaType::canConvert(v1.metaType(), QMetaType(QMetaType::Float))) {
+#else
+                } else if (v1.canConvert(QMetaType::Float)) {
+#endif
                     QVERIFY(qFuzzyCompare(v1.toFloat(), v2.toFloat()));
                 }
             }
@@ -879,7 +888,11 @@ void tst_gltfPlugins::compareParameters(const QList<Qt3DRender::QParameter *> &p
         for (auto p2 : params2) {
             if (p1->name() == p2->name()) {
                 pMatch = true;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
                 if (p1->value().metaType().id() == QMetaType::QColor) {
+#else
+                if (p1->value().type() == QMetaType::QColor) {
+#endif
                     // Colors are imported as QVector4Ds
                     QColor color = p1->value().value<QColor>();
                     QVector4D vec = p2->value().value<QVector4D>();
diff --git a/tests/auto/render/qray3d/tst_qray3d.cpp b/tests/auto/render/qray3d/tst_qray3d.cpp
index 7f8f934c6..92ee11dcb 100644
--- a/tests/auto/render/qray3d/tst_qray3d.cpp
+++ b/tests/auto/render/qray3d/tst_qray3d.cpp
@@ -517,7 +517,11 @@ void tst_QRay3D::properties()
 void tst_QRay3D::metaTypes()
 {
     int id = qMetaTypeId<Qt3DRender::RayCasting::QRay3D>();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QVERIFY(QMetaType::fromName("Qt3DRender::RayCasting::QRay3D").id() == id);
+#else
+    QVERIFY(QMetaType::type("Qt3DRender::RayCasting::QRay3D") == id);
+#endif
     QCOMPARE(QByteArray(QMetaType(id).name()), QByteArray("Qt3DRender::RayCasting::QRay3D"));
     QVERIFY(QMetaType::isRegistered(id));
 }