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/wave | |
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/wave')
-rw-r--r-- | examples/qt3d/wave/main.cpp | 4 | ||||
-rw-r--r-- | examples/qt3d/wave/wave.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp index 4c2480741..56d78f17a 100644 --- a/examples/qt3d/wave/main.cpp +++ b/examples/qt3d/wave/main.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ -#include "qt3dquickwindow.h" +#include <Qt3DQuickExtras/qt3dquickwindow.h> #include <Qt3DQuick/QQmlAspectEngine> #include <QGuiApplication> #include <QQmlEngine> @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DQuickWindow view; + Qt3DExtras::Quick::Qt3DQuickWindow view; // Expose the window as a context property so we can set the aspect ratio view.engine()->qmlEngine()->rootContext()->setContextProperty("_window", &view); diff --git a/examples/qt3d/wave/wave.pro b/examples/qt3d/wave/wave.pro index 2ec36d43a..45c8c64b6 100644 --- a/examples/qt3d/wave/wave.pro +++ b/examples/qt3d/wave/wave.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drender 3dquick 3dinput qml quick +QT += 3dcore 3drender 3dquick 3dinput qml quick 3dquickextras HEADERS += \ |