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/wave/Background.qml | 2 +- examples/qt3d/wave/BackgroundEffect.qml | 2 +- examples/qt3d/wave/BasicCamera.qml | 2 +- examples/qt3d/wave/Wave.qml | 2 +- examples/qt3d/wave/WaveEffect.qml | 2 +- examples/qt3d/wave/WaveForwardRenderer.qml | 2 +- examples/qt3d/wave/WaveMaterial.qml | 2 +- examples/qt3d/wave/main.cpp | 2 +- examples/qt3d/wave/main.qml | 2 +- examples/qt3d/wave/wave.pro | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'examples/qt3d/wave') diff --git a/examples/qt3d/wave/Background.qml b/examples/qt3d/wave/Background.qml index 7dc69003d..64468209b 100644 --- a/examples/qt3d/wave/Background.qml +++ b/examples/qt3d/wave/Background.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/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml index 1859c2ee0..ffd670d54 100644 --- a/examples/qt3d/wave/BackgroundEffect.qml +++ b/examples/qt3d/wave/BackgroundEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/wave/BasicCamera.qml b/examples/qt3d/wave/BasicCamera.qml index b2dbd10b8..ab84dfe6a 100644 --- a/examples/qt3d/wave/BasicCamera.qml +++ b/examples/qt3d/wave/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/wave/Wave.qml b/examples/qt3d/wave/Wave.qml index af7e57e4c..708e35775 100644 --- a/examples/qt3d/wave/Wave.qml +++ b/examples/qt3d/wave/Wave.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/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml index 0675e542c..58483a7d3 100644 --- a/examples/qt3d/wave/WaveEffect.qml +++ b/examples/qt3d/wave/WaveEffect.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Effect { id: root diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml index d55232de3..32a1b77c3 100644 --- a/examples/qt3d/wave/WaveForwardRenderer.qml +++ b/examples/qt3d/wave/WaveForwardRenderer.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/wave/WaveMaterial.qml b/examples/qt3d/wave/WaveMaterial.qml index 5eab12bf5..fadae7c84 100644 --- a/examples/qt3d/wave/WaveMaterial.qml +++ b/examples/qt3d/wave/WaveMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 Material { id: root diff --git a/examples/qt3d/wave/main.cpp b/examples/qt3d/wave/main.cpp index aaebf9182..eb6830b8f 100644 --- a/examples/qt3d/wave/main.cpp +++ b/examples/qt3d/wave/main.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/examples/qt3d/wave/main.qml b/examples/qt3d/wave/main.qml index 23e92beae..a81a6c38a 100644 --- a/examples/qt3d/wave/main.qml +++ b/examples/qt3d/wave/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Renderer 2.0 +import Qt3D.Render 2.0 import Qt3D.Input 2.0 Entity { diff --git a/examples/qt3d/wave/wave.pro b/examples/qt3d/wave/wave.pro index a3ce0989e..f07c740f9 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 3drenderer 3dquick 3dinput qml quick +QT += 3dcore 3drender 3dquick 3dinput qml quick HEADERS += \ -- cgit v1.2.3