summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/qgltf/main.cpp
diff options
context:
space:
mode:
authorVolker Krause <volker.krause@kdab.com>2016-05-28 14:38:13 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-05-28 13:47:45 +0000
commit96dc08ab61d6500e7a6f46a771edb9d34d12c49d (patch)
tree5ff3b7c25396b568a677a3f873ea9715f7db7cae /examples/qt3d/qgltf/main.cpp
parent469dbd4dbbba4c51402cc182e7680dc879b824ae (diff)
Unbreak qgltf example.
Change-Id: I4ded0d2497175648b16dd95337826138c362ec26 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/qgltf/main.cpp')
-rw-r--r--examples/qt3d/qgltf/main.cpp21
1 files changed, 3 insertions, 18 deletions
diff --git a/examples/qt3d/qgltf/main.cpp b/examples/qt3d/qgltf/main.cpp
index d1dad1b88..d0c330404 100644
--- a/examples/qt3d/qgltf/main.cpp
+++ b/examples/qt3d/qgltf/main.cpp
@@ -48,31 +48,16 @@
**
****************************************************************************/
-#include <window.h>
-#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DInput/QInputAspect>
-#include <Qt3DQuick/QQmlAspectEngine>
+#include <Qt3DQuickExtras/qt3dquickwindow.h>
#include <QGuiApplication>
-#include <QOpenGLContext>
-#include <QtQml>
int main(int argc, char* argv[])
{
QGuiApplication app(argc, argv);
+ Qt3DExtras::Quick::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.setSource(QUrl("qrc:/main.qml"));
+ view.setSource(QUrl("qrc:/main.qml"));
view.show();
return app.exec();