Fix Quick3DNode factories following QQmlType changes

Change-Id: I333485024f4c5534d8f2bf6ee301ba52638e6126
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

10 files changed, 15 insertions, 27 deletions

diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
index 4d399d8f4..62e8ac845 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp
+++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp
@@ -66,12 +66,10 @@ QNode *QuickNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-#if 0
         typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
-#endif
     }
 
-    return typeInfo.t ? qobject_cast<QNode *>(typeInfo.t->create()) : nullptr;
+    return typeInfo.t.isValid() ? qobject_cast<QNode *>(typeInfo.t.create()) : nullptr;
 }
 
 } // namespace Qt3DCore
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
index 6c074da04..a6029cb37 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h
+++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qhash.h>
-
+#include <QtQml/private/qqmlmetatype_p.h>
 #include <Qt3DCore/private/qabstractnodefactory_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -77,7 +77,7 @@ private:
             : quickName(quickName), version(major, minor), t(nullptr), resolved(false) { }
         QByteArray quickName;
         QPair<int, int> version;
-        QQmlType *t;
+        QQmlType t;
         bool resolved;
     };
     QHash<QByteArray, Type> m_types;
diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
index f80a058c9..879389bd9 100644
--- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
+++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qt3dquickanimationnodefactory_p.h"
-#include <private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -65,12 +64,10 @@ Qt3DCore::QNode *QuickAnimationNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-#if 0
         typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
-#endif
     }
 
-    return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : nullptr;
+    return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
 }
 
 } // namespace Qt3DAnimation
diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
index 5c7a828ed..ca10c874f 100644
--- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
+++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <private/qabstractnodefactory_p.h>
+#include <QtQml/private/qqmlmetatype_p.h>
 #include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
@@ -76,7 +77,7 @@ private:
             : quickName(quickName), version(major, minor), t(nullptr), resolved(false) { }
         QByteArray quickName;
         QPair<int, int> version;
-        QQmlType *t;
+        QQmlType t;
         bool resolved;
     };
     QHash<QByteArray, Type> m_types;
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
index 7982fe728..0692b15d6 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include <Qt3DQuickInput/private/qt3dquickinputnodefactory_p.h>
-#include <QtQml/private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -65,12 +64,10 @@ Qt3DCore::QNode *QuickInputNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-#if 0
         typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
-#endif
     }
 
-    return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : nullptr;
+    return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
 }
 
 } // namespace Qt3DInput
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
index f4d4aee27..e9d28dafe 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qhash.h>
-
+#include <QtQml/private/qqmlmetatype_p.h>
 #include <Qt3DCore/private/qabstractnodefactory_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -77,7 +77,7 @@ private:
             : quickName(quickName), version(major, minor), t(nullptr), resolved(false) { }
         QByteArray quickName;
         QPair<int, int> version;
-        QQmlType *t;
+        QQmlType t;
         bool resolved;
     };
     QHash<QByteArray, Type> m_types;
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
index f2e16495c..a4f786a76 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include <Qt3DQuickRender/private/qt3dquickrendernodefactory_p.h>
-#include <QtQml/private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -65,12 +64,10 @@ Qt3DCore::QNode *QuickRenderNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-#if 0
         typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second);
-#endif
     }
 
-    return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : nullptr;
+    return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
 }
 
 } // namespace Qt3DRender
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
index 6068124e5..dd3788878 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qhash.h>
-
+#include <QtQml/private/qqmlmetatype_p.h>
 #include <Qt3DCore/private/qabstractnodefactory_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -77,7 +77,7 @@ private:
             : quickName(quickName), version(major, minor), t(nullptr), resolved(false) { }
         QByteArray quickName;
         QPair<int, int> version;
-        QQmlType *t;
+        QQmlType t;
         bool resolved;
     };
     QHash<QByteArray, Type> m_types;
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp
index 1174f7f6d..417b28ea0 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qt3dquickscene2dnodefactory_p.h"
-#include <QtQml/private/qqmlmetatype_p.h>
 
 #include <private/qrenderaspect_p.h>
 
@@ -77,13 +76,11 @@ Qt3DCore::QNode *QuickScene2DNodeFactory::createNode(const char *type)
 
     if (!typeInfo.resolved) {
         typeInfo.resolved = true;
-#if 0
         typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName),
                                            typeInfo.version.first, typeInfo.version.second);
-#endif
     }
 
-    return typeInfo.t ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t->create()) : nullptr;
+    return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr;
 }
 
 } // namespace Qt3DRender
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
index b5eb82aa1..9166c6ec2 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <Qt3DCore/private/qabstractnodefactory_p.h>
+#include <QtQml/private/qqmlmetatype_p.h>
 #include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
@@ -76,7 +77,7 @@ private:
             : quickName(quickName), version(major, minor), t(nullptr), resolved(false) { }
         QByteArray quickName;
         QPair<int, int> version;
-        QQmlType *t;
+        QQmlType t;
         bool resolved;
     };
     QHash<QByteArray, Type> m_types;