summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/picking-qml/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/qt3d/picking-qml/main.cpp')
-rw-r--r--examples/qt3d/picking-qml/main.cpp23
1 files changed, 5 insertions, 18 deletions
diff --git a/examples/qt3d/picking-qml/main.cpp b/examples/qt3d/picking-qml/main.cpp
index d8d66801e..f6388552c 100644
--- a/examples/qt3d/picking-qml/main.cpp
+++ b/examples/qt3d/picking-qml/main.cpp
@@ -34,32 +34,19 @@
**
****************************************************************************/
-#include <QGuiApplication>
-#include <window.h>
-#include <Qt3DRender/QRenderAspect>
-#include <Qt3DInput/QInputAspect>
+#include "qt3dquickwindow.h"
+#include <QGuiApplication>
#include <Qt3DQuick/QQmlAspectEngine>
#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);
- engine.qmlEngine()->rootContext()->setContextProperty("_view", &view);
-
- engine.setSource(QUrl(QStringLiteral("qrc:/main.qml")));
-
+ view.engine()->qmlEngine()->rootContext()->setContextProperty("_view", &view);
+ view.setSource(QUrl(QStringLiteral("qrc:/main.qml")));
view.show();
return app.exec();