diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-08-21 20:28:00 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-25 13:38:45 +0000 |
| commit | dc4a29aa578c1c00fc750d1f6882e45f09134b47 (patch) | |
| tree | efe05e6fce6cbdda209084115675013599b590b2 /src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp | |
| parent | 5c99313eedada4e502b57798122ab20d71eca0fe (diff) | |
Re-enable the QQmlType code paths in the node factories
Change-Id: Ieacfbfb25de4840d7c428f89cd1f7d178852036e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp')
| -rw-r--r-- | src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp index 8dbc501b9..879389bd9 100644 --- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp +++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp @@ -64,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 |