From 8dcd8e42458748ca3ae3293b3d2b7e5b56b87252 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Thu, 14 Jan 2016 08:43:34 +0100
Subject: Link examples against static lib

Contains:
Qt3DWindow
Qt3DQuickWindow
QFirstPersonCameraController
FirstPersonCameraController.qml

This will allow to get rid of the Camera configuration hack

Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 examples/qt3d/wave/main.cpp | 24 ++++++------------------
 examples/qt3d/wave/main.qml |  4 +---
 2 files changed, 7 insertions(+), 21 deletions(-)

(limited to 'examples/qt3d/wave')

diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp
index c8c456f1a..8aa5fb8b0 100644
--- a/examples/qt3d/wave/main.cpp
+++ b/examples/qt3d/wave/main.cpp
@@ -34,32 +34,20 @@
 **
 ****************************************************************************/
 
-#include <window.h>
-#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DInput/qinputaspect.h>
+#include "qt3dquickwindow.h"
 #include <Qt3DQuick/QQmlAspectEngine>
-
 #include <QGuiApplication>
-#include <QtQml>
+#include <QQmlEngine>
+#include <QQmlContext>
 
 int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
-
-    Window view;
-    Qt3DCore::Quick::QQmlAspectEngine engine;
-
-    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
-    engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
+    Qt3DQuickWindow view;
 
     // Expose the window as a context property so we can set the aspect ratio
-    engine.qmlEngine()->rootContext()->setContextProperty("_window", &view);
-    QVariantMap data;
-    data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
-    data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view));
-    engine.aspectEngine()->setData(data);
-    engine.setSource(QUrl("qrc:/main.qml"));
-
+    view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view);
+    view.setSource(QUrl("qrc:/main.qml"));
     view.show();
 
     return app.exec();
diff --git a/examples/qt3d/wave/main.qml b/examples/qt3d/wave/main.qml
index 6f7aaddb9..a6f46bfa7 100644
--- a/examples/qt3d/wave/main.qml
+++ b/examples/qt3d/wave/main.qml
@@ -72,9 +72,7 @@ Entity {
         position: Qt.vector3d( 0.0, 10.0, 25.0 )
     }
 
-    Configuration  {
-        controlledCamera: mainCamera
-    }
+    FirstPersonCameraController { camera: mainCamera }
 
     Background {
         id: background
-- 
cgit v1.2.3