Re-enable the QQmlType code paths in the node factories

Change-Id: Ieacfbfb25de4840d7c428f89cd1f7d178852036e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 3 insertions, 5 deletions

diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
index be7dec52a..2e1f993f9 100644
--- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "qt3dquickextrasnodefactory_p.h"
-#include <private/qqmlmetatype_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -65,12 +64,10 @@ Qt3DCore::QNode *QuickExtrasNodeFactory::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 Qt3DExtras
diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
index 03769c397..43172952c 100644
--- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
+++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
@@ -53,6 +53,7 @@
 
 #include <private/qabstractnodefactory_p.h>
 #include <QtCore/qhash.h>
+#include <QtQml/private/qqmlmetatype_p.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;