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>

3 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 040fc3a8a..31f81fa3d 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -38,7 +38,7 @@
 
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qtransform.h>
-#include <Qt3DCore/qcameralens.h>
+#include <Qt3DRender/qcameralens.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qmesh.h>
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index 6bfca2b55..a37fd9c0b 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -44,7 +44,7 @@
 
 #include <QtGui/QVector2D>
 
-#include <Qt3DCore/QCameraLens>
+#include <Qt3DRender/QCameraLens>
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QTransform>
 
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.h b/src/plugins/sceneparsers/gltf/gltfparser.h
index be8bcaa50..544aff41c 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser.h
@@ -61,13 +61,13 @@ QT_BEGIN_NAMESPACE
 class QFile;
 
 namespace Qt3DCore {
-class QCamera;
-class QCameraLens;
 class QEntity;
 }
 
 namespace Qt3DRender {
 
+class QCamera;
+class QCameraLens;
 class QMaterial;
 class QShaderProgram;
 class QEffect;
@@ -142,7 +142,7 @@ private:
 
     Qt3DCore::QEntity *defaultScene();
     QMaterial *material(const QString &id);
-    Qt3DCore::QCameraLens *camera(const QString &id) const;
+    QCameraLens *camera(const QString &id) const;
 
     void parse();
     void cleanup();