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>

1 files changed, 5 insertions, 3 deletions

diff --git a/examples/qt3d/examples-common/qt3dwindow.h b/examples/qt3d/examples-common/qt3dwindow.h
index b42e3d81c..df527acd6 100644
--- a/examples/qt3d/examples-common/qt3dwindow.h
+++ b/examples/qt3d/examples-common/qt3dwindow.h
@@ -43,11 +43,12 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 class QAspectEngine;
-class QCamera;
+class QAbstractAspect;
 class QEntity;
 }
 
 namespace Qt3DRender {
+class QCamera;
 class QFrameGraph;
 class QRenderAspect;
 }
@@ -72,8 +73,9 @@ public:
     void registerAspect(const QString &name);
 
     void setRootEntity(Qt3DCore::QEntity *root);
+    void setFrameGraph(Qt3DRender::QFrameGraph *frameGraph);
 
-    Qt3DCore::QCamera *camera() const;
+    Qt3DRender::QCamera *camera() const;
 
 public Q_SLOTS:
 
@@ -93,7 +95,7 @@ private:
 
     // Renderer configuration
     Qt3DRender::QFrameGraph *m_frameGraph;
-    Qt3DCore::QCamera *m_defaultCamera;
+    Qt3DRender::QCamera *m_defaultCamera;
 
     // Input configuration