From 18964d9ebed281a72506eccdf26319ce18be46d7 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Sun, 18 Oct 2015 09:58:19 +0100 Subject: 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 --- examples/qt3d/materials/Barrel.qml | 2 +- examples/qt3d/materials/BasicCamera.qml | 2 +- examples/qt3d/materials/Chest.qml | 2 +- examples/qt3d/materials/HousePlant.qml | 2 +- examples/qt3d/materials/PlaneEntity.qml | 2 +- examples/qt3d/materials/RenderableEntity.qml | 2 +- examples/qt3d/materials/SortedForwardRenderer.qml | 2 +- examples/qt3d/materials/TrefoilKnot.qml | 2 +- examples/qt3d/materials/main.cpp | 2 +- examples/qt3d/materials/main.qml | 2 +- examples/qt3d/materials/materials.pro | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/qt3d/materials') diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml index 55d2ee403..ba703a998 100644 --- a/examples/qt3d/materials/Barrel.qml +++ b/examples/qt3d/materials/Barrel.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/BasicCamera.qml b/examples/qt3d/materials/BasicCamera.qml index 5e251ee4d..d89de8b73 100644 --- a/examples/qt3d/materials/BasicCamera.qml +++ b/examples/qt3d/materials/BasicCamera.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Camera { id: mainCamera diff --git a/examples/qt3d/materials/Chest.qml b/examples/qt3d/materials/Chest.qml index a578328f7..bc3fcd838 100644 --- a/examples/qt3d/materials/Chest.qml +++ b/examples/qt3d/materials/Chest.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml index 3df036675..9ed378e6a 100644 --- a/examples/qt3d/materials/HousePlant.qml +++ b/examples/qt3d/materials/HousePlant.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/PlaneEntity.qml b/examples/qt3d/materials/PlaneEntity.qml index 57a925622..e02318597 100644 --- a/examples/qt3d/materials/PlaneEntity.qml +++ b/examples/qt3d/materials/PlaneEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/RenderableEntity.qml b/examples/qt3d/materials/RenderableEntity.qml index f11d28272..093ba24e5 100644 --- a/examples/qt3d/materials/RenderableEntity.qml +++ b/examples/qt3d/materials/RenderableEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index a48db2567..9d09f0a29 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 TechniqueFilter { id: root diff --git a/examples/qt3d/materials/TrefoilKnot.qml b/examples/qt3d/materials/TrefoilKnot.qml index b0cd508d4..762ae5398 100644 --- a/examples/qt3d/materials/TrefoilKnot.qml +++ b/examples/qt3d/materials/TrefoilKnot.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Entity { id: root diff --git a/examples/qt3d/materials/main.cpp b/examples/qt3d/materials/main.cpp index e40da9894..885d51803 100644 --- a/examples/qt3d/materials/main.cpp +++ b/examples/qt3d/materials/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml index 3fa870d74..c41126efa 100644 --- a/examples/qt3d/materials/main.qml +++ b/examples/qt3d/materials/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/qt3d/materials/materials.pro b/examples/qt3d/materials/materials.pro index d8b5f1b88..a5c892fe8 100644 --- a/examples/qt3d/materials/materials.pro +++ b/examples/qt3d/materials/materials.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput 3dquick qml quick +QT += 3dcore 3drender 3dinput 3dquick qml quick HEADERS += \ -- cgit v1.2.3