2 files changed, 8 insertions, 21 deletions
diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp
index e2eb9aa9c..89bb96736 100644
--- a/examples/qt3d/materials/main.cpp
+++ b/examples/qt3d/materials/main.cpp
@@ -34,31 +34,20 @@
 **
 ****************************************************************************/
 
-#include <window.h>
-#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DInput/QInputAspect>
+#include "qt3dquickwindow.h"
 #include <Qt3DQuick/QQmlAspectEngine>
-
 #include <QGuiApplication>
-#include <QtQml>
+#include <QQmlEngine>
+#include <QQmlContext>
 
 int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
+    Qt3DQuickWindow view;
 
-    Window view;
-    Qt3DCore::Quick::QQmlAspectEngine engine;
-
-    engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect());
-    engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect());
-    QVariantMap data;
-    data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
-    data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view));
-
-    engine.aspectEngine()->setData(data);
-    // Expose the window as a context property so we can set the aspect ratio
-    engine.qmlEngine()->rootContext()->setContextProperty("_window", &view);
-    engine.setSource(QUrl("qrc:/main.qml"));
+        // Expose the window as a context property so we can set the aspect ratio
+    view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view);
+    view.setSource(QUrl("qrc:/main.qml"));
     view.show();
 
     return app.exec();
diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml
index de759209b..a470e2415 100644
--- a/examples/qt3d/materials/main.qml
+++ b/examples/qt3d/materials/main.qml
@@ -59,9 +59,7 @@ Entity {
         viewCenter: Qt.vector3d( 0.0, 3.5, 0.0 )
     }
 
-    Configuration  {
-        controlledCamera: mainCamera
-    }
+    FirstPersonCameraController { camera: mainCamera }
 
     PhongMaterial {
         id: redAdsMaterial