diff options
Diffstat (limited to 'examples/qt3d/assimp/main.cpp')
-rw-r--r-- | examples/qt3d/assimp/main.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 1b59163f2..ba238eafe 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -34,12 +34,9 @@ ** ****************************************************************************/ -#include <window.h> -#include <Qt3DRender/QRenderAspect> +#include <qt3dquickwindow.h> #include <Qt3DRender/QSceneLoader> #include <Qt3DCore/QEntity> -#include <Qt3DInput/QInputAspect> -#include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <qqml.h> @@ -94,17 +91,10 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Window view; - Qt3DCore::Quick::QQmlAspectEngine engine; + Qt3DQuickWindow view; - 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); qmlRegisterType<SceneHelper>("Qt3D.Examples", 2, 0, "SceneHelper"); - engine.setSource(QUrl("qrc:/main.qml")); + view.setSource(QUrl("qrc:/main.qml")); view.show(); return app.exec(); |