diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
| commit | 099f466847039954c581030c2a5aa2bfce08e0eb (patch) | |
| tree | 194a94d15a68b0c38d2d45c12275afb2c91b9831 /examples/qt3d/assimp | |
| parent | 7bbd402770fa27f944840c95b6a3c6121883bc58 (diff) | |
| parent | b71f09d143002f15abfd4a407651544942a75c44 (diff) | |
Merge branch '5.5.0' into 5.5
Conflicts:
src/input/qkeyboardcontroller.cpp
Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
Diffstat (limited to 'examples/qt3d/assimp')
| -rw-r--r-- | examples/qt3d/assimp/main.cpp | 4 | ||||
| -rw-r--r-- | examples/qt3d/assimp/main.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index d9c0ede88..d8fcbc269 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include <Qt3DCore/window.h> +#include <window.h> #include <Qt3DRenderer/qrenderaspect.h> #include <Qt3DInput/QInputAspect> #include <Qt3DQuick/QQmlAspectEngine> @@ -46,7 +46,7 @@ int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3D::Window view; + Window view; Qt3D::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index f93c20171..ae6431476 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { |