diff options
Diffstat (limited to 'examples/qt3d/wireframe/main.cpp')
-rw-r--r-- | examples/qt3d/wireframe/main.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/examples/qt3d/wireframe/main.cpp b/examples/qt3d/wireframe/main.cpp index de613c520..00820a857 100644 --- a/examples/qt3d/wireframe/main.cpp +++ b/examples/qt3d/wireframe/main.cpp @@ -34,9 +34,7 @@ ** ****************************************************************************/ -#include <window.h> -#include <Qt3DRender/qrenderaspect.h> -#include <Qt3DInput/QInputAspect> +#include "qt3dquickwindow.h" #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> @@ -45,21 +43,11 @@ 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(); |