summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/simple-qml/main.cpp
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-01-14 08:43:34 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-01-16 01:59:44 +0000
commit8dcd8e42458748ca3ae3293b3d2b7e5b56b87252 (patch)
treeb4a63f6bd0665e9cdeb64ebdb9caaded12be16ff /examples/qt3d/simple-qml/main.cpp
parent78ad6123fb4f8597eb936e2c4b1636d307df4ecc (diff)
Link examples against static lib
Contains: Qt3DWindow Qt3DQuickWindow QFirstPersonCameraController FirstPersonCameraController.qml This will allow to get rid of the Camera configuration hack Change-Id: I55c5634aa4c162f9dd2852d3258073a6352b426c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/simple-qml/main.cpp')
-rw-r--r--examples/qt3d/simple-qml/main.cpp22
1 files changed, 3 insertions, 19 deletions
diff --git a/examples/qt3d/simple-qml/main.cpp b/examples/qt3d/simple-qml/main.cpp
index 2305a685e..04fa98212 100644
--- a/examples/qt3d/simple-qml/main.cpp
+++ b/examples/qt3d/simple-qml/main.cpp
@@ -34,30 +34,14 @@
**
****************************************************************************/
-#include <window.h>
-#include <Qt3DRender/qrenderaspect.h>
-#include <Qt3DInput/QInputAspect>
-#include <Qt3DLogic/QLogicAspect>
-#include <Qt3DQuick/QQmlAspectEngine>
-
+#include "qt3dquickwindow.h"
#include <QGuiApplication>
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());
- engine.aspectEngine()->registerAspect(new Qt3DLogic::QLogicAspect());
- 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"));
-
+ Qt3DQuickWindow view;
+ view.setSource(QUrl("qrc:/main.qml"));
view.show();
return app.exec();