diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-26 08:38:15 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 12:17:58 +0000 |
commit | 3da9e8d6714da3d9d6aec6932e4edae0a2135065 (patch) | |
tree | 054ed3f57c9c8f6822a98dc3ef6d5e55ebd3ada9 /examples/qt3d/assimp | |
parent | 5eb447f4ecbbab387573c3bb8a34298b652c032a (diff) |
Move last remaining pieces of examples-common to Qt3DExtras
Also created a Quick3DExtras for QML related extras (Qt3DQuickWindow)
Change-Id: I1b95ea841e07ac8d68a07a1911d783b722e6fe03
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/assimp')
-rw-r--r-- | examples/qt3d/assimp/assimp.pro | 2 | ||||
-rw-r--r-- | examples/qt3d/assimp/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro index 798a22b67..97f502bc7 100644 --- a/examples/qt3d/assimp/assimp.pro +++ b/examples/qt3d/assimp/assimp.pro @@ -4,7 +4,7 @@ SOURCE += main.cpp -QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras +QT += qml quick 3dcore 3drender 3dinput 3dquick 3dextras 3dquickextras OTHER_FILES += main.qml diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index e0e62acb8..78d2035d9 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include <qt3dquickwindow.h> +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DRender/QSceneLoader> #include <Qt3DCore/QEntity> @@ -105,7 +105,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; qmlRegisterType<SceneHelper>("Qt3D.Examples", 2, 0, "SceneHelper"); view.setSource(QUrl("qrc:/main.qml")); |