diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2017-08-03 16:33:09 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2017-08-03 14:41:11 +0000 |
| commit | 176f088c540fc17ebc6f18b436017b1975edf511 (patch) | |
| tree | 90f069bade5fdcd56768330ed7ef9caf68c8cdb2 | |
| parent | 1071f3e6a2b4d39ca677cb11d50c5e36b4428ea5 (diff) | |
Disable QQmlType codepaths
Will allow to update the qt5.git configuration without breaking the CI
Change-Id: I16d7e2af9da935d4d31f5909575c8edec4a9432e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 files changed, 10 insertions, 0 deletions
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory.cpp b/src/quick3d/quick3d/qt3dquicknodefactory.cpp index a8c021754..4d399d8f4 100644 --- a/src/quick3d/quick3d/qt3dquicknodefactory.cpp +++ b/src/quick3d/quick3d/qt3dquicknodefactory.cpp @@ -66,7 +66,9 @@ QNode *QuickNodeFactory::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<QNode *>(typeInfo.t->create()) : nullptr; diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp index 4fd7d30cc..f80a058c9 100644 --- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp +++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp @@ -65,7 +65,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; diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp index b158e30d5..7982fe728 100644 --- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp +++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory.cpp @@ -65,7 +65,9 @@ Qt3DCore::QNode *QuickInputNodeFactory::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; diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp index f57451379..f2e16495c 100644 --- a/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp +++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory.cpp @@ -65,7 +65,9 @@ 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; diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp index 5d092501e..1174f7f6d 100644 --- a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp +++ b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory.cpp @@ -77,8 +77,10 @@ Qt3DCore::QNode *QuickScene2DNodeFactory::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; |