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/render/backend | |
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/render/backend')
-rw-r--r-- | src/render/backend/cameralens.cpp | 2 | ||||
-rw-r--r-- | src/render/backend/entity.cpp | 2 | ||||
-rw-r--r-- | src/render/backend/renderer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp index 3d039f298..34ba8f399 100644 --- a/src/render/backend/cameralens.cpp +++ b/src/render/backend/cameralens.cpp @@ -38,7 +38,7 @@ #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DCore/qcameralens.h> +#include <Qt3DRender/qcameralens.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index e1fc32160..36e7654b3 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -50,7 +50,7 @@ #include <Qt3DRender/qcomputejob.h> #include <Qt3DRender/private/geometryrenderermanager_p.h> -#include <Qt3DCore/qcameralens.h> +#include <Qt3DRender/qcameralens.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qtransform.h> diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index aa511fc70..81bf16a18 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -77,7 +77,7 @@ #include <Qt3DRender/private/geometryrenderermanager_p.h> #include <Qt3DRender/private/openglvertexarrayobject_p.h> -#include <Qt3DCore/qcameralens.h> +#include <Qt3DRender/qcameralens.h> #include <Qt3DCore/private/qeventfilterservice_p.h> #include <Qt3DCore/private/qabstractaspectjobmanager_p.h> |