diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-01-15 15:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-16 17:17:49 +0000 |
| commit | b0404a42ced2ea5a583e1c6ddc22940ffdc1e48e (patch) | |
| tree | b073c3c680e388bda00228b204743b092b11de6a /src/quick3d/imports/core | |
| parent | 8656b95ffb67efe7dd1cc3a65b12d277e83e1d22 (diff) | |
Move QCamera/QCameraLens to Qt3DRender
Also get rid of Qt3DRender::QWindow and of the hard codes camera
controller.
Change-Id: I307735d01caf97b7a690b28de8dc99fc9866c35f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/core')
| -rw-r--r-- | src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index 04e7eab1e..c8b1a64e0 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -35,8 +35,6 @@ ****************************************************************************/ #include "qt3dquick3dcoreplugin.h" -#include <Qt3DCore/qcameralens.h> -#include <Qt3DCore/qcamera.h> #include <Qt3DCore/qtransform.h> #include <private/quick3dentity_p.h> #include <private/quick3dentityloader_p.h> @@ -64,8 +62,6 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) // Ideally we want to make Node an uncreatable type // We would need qmlRegisterUncreatableExtendedType for that qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class")); - Qt3DCore::Quick::registerExtendedType<Qt3DCore::QCamera, Qt3DCore::Quick::Quick3DNode>("QCamera", "Qt3D.Core/Camera", uri, 2, 0, "Camera"); - qmlRegisterType<Qt3DCore::QCameraLens>(uri, 2, 0, "CameraLens"); } QT_END_NAMESPACE |