summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/assimp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-10-18 09:58:19 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-19 10:51:25 +0000
commit18964d9ebed281a72506eccdf26319ce18be46d7 (patch)
tree9c184a8645f0d3ea72fc692f84332fc9be01bf2e /examples/qt3d/assimp
parentd9ae5577ea87ae23731fe54dd79fd80ecd1de1fa (diff)
Rename Renderer -> Render throughout
This is for consistency between the C++ namespaces and QML imports and with the other aspects. Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/assimp')
-rw-r--r--examples/qt3d/assimp/assimp.pro2
-rw-r--r--examples/qt3d/assimp/main.cpp4
-rw-r--r--examples/qt3d/assimp/main.qml2
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/assimp/assimp.pro b/examples/qt3d/assimp/assimp.pro
index 65dd19d11..02eac7dc9 100644
--- a/examples/qt3d/assimp/assimp.pro
+++ b/examples/qt3d/assimp/assimp.pro
@@ -4,7 +4,7 @@
SOURCE += main.cpp
-QT += qml quick 3dcore 3drenderer 3dinput 3dquick
+QT += qml quick 3dcore 3drender 3dinput 3dquick
OTHER_FILES += main.qml
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp
index e8389bf33..f0b8b6fbc 100644
--- a/examples/qt3d/assimp/main.cpp
+++ b/examples/qt3d/assimp/main.cpp
@@ -35,8 +35,8 @@
****************************************************************************/
#include <window.h>
-#include <Qt3DRenderer/QRenderAspect>
-#include <Qt3DRenderer/QSceneLoader>
+#include <Qt3DRender/QRenderAspect>
+#include <Qt3DRender/QSceneLoader>
#include <Qt3DCore/QEntity>
#include <Qt3DInput/QInputAspect>
#include <Qt3DQuick/QQmlAspectEngine>
diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml
index f0965ac04..2b5f953ea 100644
--- a/examples/qt3d/assimp/main.qml
+++ b/examples/qt3d/assimp/main.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import Qt3D.Core 2.0
-import Qt3D.Renderer 2.0
+import Qt3D.Render 2.0
import Qt3D.Examples 2.0
import QtQuick 2.0 as Quick