diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-08-19 15:53:30 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-08-19 16:28:52 +0100 |
| commit | 8f863343a9e2e2f3630f22407f4e5e30e72745cf (patch) | |
| tree | 5574e3c2215d74345e15df5f45ed3211e065541a /src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp | |
| parent | 3edb85002b848033bbeefa33001d19fb514ef489 (diff) | |
| parent | 9d8c9ada161ad97634992c444196add0abb4f9d1 (diff) | |
Merge branch '5.9' into dev
Conflicts:
src/render/backend/renderer.cpp
src/render/backend/renderview.cpp
src/render/graphicshelpers/graphicscontext_p.h
src/render/graphicshelpers/graphicshelperes2_p.h
src/render/graphicshelpers/graphicshelpergl2_p.h
src/render/graphicshelpers/graphicshelpergl3_2_p.h
src/render/graphicshelpers/graphicshelpergl3_3_p.h
src/render/graphicshelpers/graphicshelpergl4_p.h
src/render/graphicshelpers/graphicshelperinterface_p.h
src/render/jobs/pickboundingvolumejob.cpp
tests/auto/animation/clipanimator/tst_clipanimator.cpp
tests/auto/auto.pro
tests/manual/manual.pro
Also disabled the QQmlMetaType codepaths following commit
49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The
QQmlMetaType codepaths will be re-enabled once a qt5.git
integration has succeeded.
Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
Diffstat (limited to 'src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp')
| -rw-r--r-- | src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp index 4fd7d30cc..8dbc501b9 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,7 +64,9 @@ 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; |