diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-18 09:58:19 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-19 10:51:25 +0000 |
| commit | 18964d9ebed281a72506eccdf26319ce18be46d7 (patch) | |
| tree | 9c184a8645f0d3ea72fc692f84332fc9be01bf2e /examples/qt3d/basicshapes-cpp | |
| parent | d9ae5577ea87ae23731fe54dd79fd80ecd1de1fa (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/basicshapes-cpp')
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/main.cpp | 22 | ||||
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/scenemodifier.h | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro index d1f3f8aaa..da83571fb 100644 --- a/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro +++ b/examples/qt3d/basicshapes-cpp/basicshapes-cpp.pro @@ -6,7 +6,7 @@ android|ios|winrt { error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput QT += widgets SOURCES += main.cpp \ diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp index 9bddbd314..b34a3a18c 100644 --- a/examples/qt3d/basicshapes-cpp/main.cpp +++ b/examples/qt3d/basicshapes-cpp/main.cpp @@ -52,14 +52,14 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/qtorusmesh.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qtechnique.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qrenderpass.h> -#include <Qt3DRenderer/qsceneloader.h> +#include <Qt3DRender/qtorusmesh.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qtechnique.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qrenderpass.h> +#include <Qt3DRender/qsceneloader.h> #include <Qt3DCore/qscaletransform.h> #include <Qt3DCore/qrotatetransform.h> @@ -67,9 +67,9 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/qaspectengine.h> -#include <Qt3DRenderer/qrenderaspect.h> -#include <Qt3DRenderer/qframegraph.h> -#include <Qt3DRenderer/qforwardrenderer.h> +#include <Qt3DRender/qrenderaspect.h> +#include <Qt3DRender/qframegraph.h> +#include <Qt3DRender/qforwardrenderer.h> int main(int argc, char **argv) { diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h index f108298ac..fa1fc20b6 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.h +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h @@ -45,11 +45,11 @@ #include <Qt3DCore/qtransform.h> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QTorusMesh> -#include <Qt3DRenderer/QCylinderMesh> -#include <Qt3DRenderer/QCuboidMesh> -#include <Qt3DRenderer/QSphereMesh> -#include <Qt3DRenderer/QPhongMaterial> +#include <Qt3DRender/QTorusMesh> +#include <Qt3DRender/QCylinderMesh> +#include <Qt3DRender/QCuboidMesh> +#include <Qt3DRender/QSphereMesh> +#include <Qt3DRender/QPhongMaterial> class SceneModifier : public QObject { |