diff options
| author | Mike Krus <mike.krus@kdab.com> | 2016-03-16 21:09:04 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2016-03-17 21:21:39 +0000 |
| commit | 7b04eec1ceb5de8c9f74ed0fa319287035480754 (patch) | |
| tree | 5988deb15432bd859094ef0bc849a3815aa71824 /src/quick3d | |
| parent | 7aa715798b7771586e1109ebd61eb492c8a8f613 (diff) | |
Merge QAbstractSceneLoader down into QSceneLoader
Task-number: QTBUG-51484
Change-Id: I8eebe105331cb94306d27739996e34862fbd1a0a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d')
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 2 | ||||
| -rw-r--r-- | src/quick3d/quick3drender/items/quick3dscene_p.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index bb2e8e947..64fad93e4 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -39,7 +39,6 @@ ****************************************************************************/ #include "qt3dquick3drenderplugin.h" -#include <Qt3DRender/qabstractsceneloader.h> #include <Qt3DRender/qsceneloader.h> #include <Qt3DRender/qmesh.h> #include <Qt3DRender/qrenderpass.h> @@ -185,7 +184,6 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType<Qt3DRender::QPickingSettings>(uri, 2, 0, "PickingSettings"); // @uri Qt3D.Render - qmlRegisterUncreatableType<Qt3DRender::QAbstractSceneLoader>(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QSceneLoader, Qt3DRender::Render::Quick::Quick3DScene>("QSceneLoader", "Qt3D.Render/SceneLoader", uri, 2, 0, "SceneLoader"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QEffect, Qt3DRender::Render::Quick::Quick3DEffect>("QEffect", "Qt3D.Render/Effect", uri, 2, 0, "Effect"); Qt3DRender::Quick::registerExtendedType<Qt3DRender::QTechnique, Qt3DRender::Render::Quick::Quick3DTechnique>("QTechnique", "Qt3D.Render/Technique", uri, 2, 0, "Technique"); diff --git a/src/quick3d/quick3drender/items/quick3dscene_p.h b/src/quick3d/quick3drender/items/quick3dscene_p.h index 30674651b..60c2d2ab5 100644 --- a/src/quick3d/quick3drender/items/quick3dscene_p.h +++ b/src/quick3d/quick3drender/items/quick3dscene_p.h @@ -53,7 +53,7 @@ #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> #include <Qt3DQuick/private/quick3dentity_p.h> -#include <Qt3DRender/qabstractsceneloader.h> +#include <Qt3DRender/qsceneloader.h> QT_BEGIN_NAMESPACE @@ -67,7 +67,7 @@ class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DScene : public QObject public: explicit Quick3DScene(QObject *parent = 0); - inline QAbstractSceneLoader *parentScene() const { return qobject_cast<QAbstractSceneLoader *>(parent()); } + inline QSceneLoader *parentScene() const { return qobject_cast<QSceneLoader *>(parent()); } }; } // namespace Quick |