summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2017-08-03 12:49:29 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-08-16 08:08:44 +0000
commit0e3ba4328cab77d44baaf972150332a51c5ea003 (patch)
tree7272fd5d6c797ca12b565db78d8b77a795b1ea57 /src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp
parentaa16ae56f6a3f559e4d195717fbdb9c57c7579cd (diff)
Fix Quick3DNode factories following QQmlType changes
Change-Id: I333485024f4c5534d8f2bf6ee301ba52638e6126 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp')
-rw-r--r--src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp5
1 files changed, 1 insertions, 4 deletions
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