diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2017-08-03 12:49:29 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-08-16 08:08:44 +0000 |
commit | 0e3ba4328cab77d44baaf972150332a51c5ea003 (patch) | |
tree | 7272fd5d6c797ca12b565db78d8b77a795b1ea57 /src/quick3d/quick3drender | |
parent | aa16ae56f6a3f559e4d195717fbdb9c57c7579cd (diff) |
Fix Quick3DNode factories following QQmlType changes
Change-Id: I333485024f4c5534d8f2bf6ee301ba52638e6126
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/quick3d/quick3drender')
-rw-r--r-- | src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp | 5 | ||||
-rw-r--r-- | src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h | 4 |
2 files changed, 3 insertions, 6 deletions
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; |