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>

29 files changed, 102 insertions, 102 deletions

diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index a21ebad09..619547bcf 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -36,14 +36,14 @@
 
 #include "qdiffusemapmaterial.h"
 #include "qdiffusemapmaterial_p.h"
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h
index b1a6471aa..2f91b4efc 100644
--- a/src/render/defaults/qdiffusemapmaterial.h
+++ b/src/render/defaults/qdiffusemapmaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
 #define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H
 
-#include <Qt3DRenderer/qmaterial.h>
+#include <Qt3DRender/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QDiffuseMapMaterialPrivate;
 class QAbstractTextureProvider;
 
-class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial
+class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial
 {
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h
index 68beff5c5..0badb01ff 100644
--- a/src/render/defaults/qdiffusemapmaterial_p.h
+++ b/src/render/defaults/qdiffusemapmaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qmaterial_p.h>
+#include <Qt3DRender/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 542cb202d..2a1c759d9 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -37,14 +37,14 @@
 #include "qdiffusespecularmapmaterial.h"
 #include "qdiffusespecularmapmaterial_p.h"
 
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h
index f49341e9f..51544babf 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
 #define QT3DRENDER_RENDER_QDIFFUSESPECULARMAPMATERIAL_H
 
-#include <Qt3DRenderer/qmaterial.h>
+#include <Qt3DRender/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QAbstractTextureProvider;
 class QDiffuseSpecularMapMaterialPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial
+class QT3DRENDERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial
 {
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h
index 1affe1f93..8d049305c 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qmaterial_p.h>
+#include <Qt3DRender/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index 2ff2d6784..14e623251 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -37,10 +37,10 @@
 #include "qforwardrenderer.h"
 #include "qforwardrenderer_p.h"
 
-#include <Qt3DRenderer/qviewport.h>
-#include <Qt3DRenderer/qcameraselector.h>
-#include <Qt3DRenderer/qclearbuffer.h>
-#include <Qt3DRenderer/qannotation.h>
+#include <Qt3DRender/qviewport.h>
+#include <Qt3DRender/qcameraselector.h>
+#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qannotation.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h
index 44249c767..10aacde9c 100644
--- a/src/render/defaults/qforwardrenderer.h
+++ b/src/render/defaults/qforwardrenderer.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QFORWARDRENDERER_H
 #define QT3DRENDER_RENDER_QFORWARDRENDERER_H
 
-#include <Qt3DRenderer/qtechniquefilter.h>
+#include <Qt3DRender/qtechniquefilter.h>
 #include <QRectF>
 #include <QColor>
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QForwardRendererPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter
+class QT3DRENDERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter
 {
     Q_OBJECT
     Q_PROPERTY(QRectF viewportRect READ viewportRect WRITE setViewportRect NOTIFY viewportRectChanged)
diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/render/defaults/qforwardrenderer_p.h
index 53517917d..fcbb5be39 100644
--- a/src/render/defaults/qforwardrenderer_p.h
+++ b/src/render/defaults/qforwardrenderer_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qtechniquefilter_p.h>
+#include <Qt3DRender/private/qtechniquefilter_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qgoochmaterial.cpp b/src/render/defaults/qgoochmaterial.cpp
index c969df70b..c59c197a2 100644
--- a/src/render/defaults/qgoochmaterial.cpp
+++ b/src/render/defaults/qgoochmaterial.cpp
@@ -37,11 +37,11 @@
 #include "qgoochmaterial.h"
 #include "qgoochmaterial_p.h"
 
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qopenglfilter.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qtechnique.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qtechnique.h>
 
 #include <QtCore/qurl.h>
 
diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h
index 6135b9eb3..188ca0805 100644
--- a/src/render/defaults/qgoochmaterial.h
+++ b/src/render/defaults/qgoochmaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QGOOCHMATERIAL_H
 #define QT3DRENDER_RENDER_QGOOCHMATERIAL_H
 
-#include <Qt3DRenderer/qmaterial.h>
+#include <Qt3DRender/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/defaults/qgoochmaterial_p.h b/src/render/defaults/qgoochmaterial_p.h
index 8538ad47b..bdd38f87a 100644
--- a/src/render/defaults/qgoochmaterial_p.h
+++ b/src/render/defaults/qgoochmaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qmaterial_p.h>
+#include <Qt3DRender/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index a75b8f7f5..3971193a3 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -37,15 +37,15 @@
 #include "qnormaldiffusemapalphamaterial.h"
 #include "qnormaldiffusemapalphamaterial_p.h"
 
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
-#include <Qt3DRenderer/qalphacoverage.h>
-#include <Qt3DRenderer/qdepthtest.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qalphacoverage.h>
+#include <Qt3DRender/qdepthtest.h>
 
 #include <QUrl>
 #include <QVector3D>
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h
index 38188e04c..57b53e2a4 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
 #define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPALPHAMATERIAL_H
 
-#include <Qt3DRenderer/qnormaldiffusemapmaterial.h>
+#include <Qt3DRender/qnormaldiffusemapmaterial.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,7 +45,7 @@ namespace Qt3DRender {
 
 class QNormalDiffuseMapAlphaMaterialPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDiffuseMapMaterial
+class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDiffuseMapMaterial
 {
     Q_OBJECT
 public:
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
index 66f3bd1f8..59135908c 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qnormaldiffusemapmaterial_p.h>
+#include <Qt3DRender/private/qnormaldiffusemapmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index 64bc8f768..a37c9cb9e 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -37,13 +37,13 @@
 #include "qnormaldiffusemapmaterial.h"
 #include "qnormaldiffusemapmaterial_p.h"
 
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
 
 #include <QUrl>
 #include <QVector3D>
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h
index 158cfca45..f6faad788 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
 #define QT3DRENDER_RENDER_QNORMALDIFFUSEMAPMATERIAL_H
 
-#include <Qt3DRenderer/qmaterial.h>
+#include <Qt3DRender/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QAbstractTextureProvider;
 class QNormalDiffuseMapMaterialPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial
+class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial
 {
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h
index 96b952ce3..7bf820541 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qmaterial_p.h>
+#include <Qt3DRender/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index d779768d3..17e7c4e6d 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -36,14 +36,14 @@
 
 #include "qnormaldiffusespecularmapmaterial.h"
 #include "qnormaldiffusespecularmapmaterial_p.h"
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
index 668fed0f3..6f437288d 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
 #define QT3DRENDER_RENDER_QNORMALDIFFUSESPECULARMAPMATERIAL_H
 
-#include <Qt3DRenderer/qmaterial.h>
+#include <Qt3DRender/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QNormalDiffuseSpecularMapMaterialPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMaterial
+class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMaterial
 {
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
index e0703c92c..fcb85fe91 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qmaterial_p.h>
+#include <Qt3DRender/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp
index 37fddd691..c80013e5e 100644
--- a/src/render/defaults/qpervertexcolormaterial.cpp
+++ b/src/render/defaults/qpervertexcolormaterial.cpp
@@ -36,13 +36,13 @@
 
 #include "qpervertexcolormaterial.h"
 #include "qpervertexcolormaterial_p.h"
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h
index 7ce8ece79..300eab170 100644
--- a/src/render/defaults/qpervertexcolormaterial.h
+++ b/src/render/defaults/qpervertexcolormaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
 #define QT3DRENDER_RENDER_QPERVERTEXCOLORMATERIAL_H
 
-#include <Qt3DRenderer/qmaterial.h>
+#include <Qt3DRender/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QPerVertexColorMaterialPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial
+class QT3DRENDERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial
 {
     Q_OBJECT
 
diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/render/defaults/qpervertexcolormaterial_p.h
index 676ec0a9a..5b6079b0f 100644
--- a/src/render/defaults/qpervertexcolormaterial_p.h
+++ b/src/render/defaults/qpervertexcolormaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qmaterial_p.h>
+#include <Qt3DRender/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp
index 8e9186418..aaa8e338a 100644
--- a/src/render/defaults/qphongmaterial.cpp
+++ b/src/render/defaults/qphongmaterial.cpp
@@ -36,13 +36,13 @@
 
 #include "qphongmaterial.h"
 #include "qphongmaterial_p.h"
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qshaderprogram.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qshaderprogram.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
 #include <QUrl>
 #include <QVector3D>
 #include <QVector4D>
diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h
index f9576058c..ba4a42afb 100644
--- a/src/render/defaults/qphongmaterial.h
+++ b/src/render/defaults/qphongmaterial.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_RENDER_QPHONGMATERIAL_H
 #define QT3DRENDER_RENDER_QPHONGMATERIAL_H
 
-#include <Qt3DRenderer/qmaterial.h>
+#include <Qt3DRender/qmaterial.h>
 #include <QColor>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QPhongMaterialPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QPhongMaterial : public QMaterial
+class QT3DRENDERSHARED_EXPORT QPhongMaterial : public QMaterial
 {
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h
index c6441a641..527310097 100644
--- a/src/render/defaults/qphongmaterial_p.h
+++ b/src/render/defaults/qphongmaterial_p.h
@@ -48,7 +48,7 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/private/qmaterial_p.h>
+#include <Qt3DRender/private/qmaterial_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index 1e9b9641e..8fd526c46 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -38,17 +38,17 @@
 #include "qskyboxentity_p.h"
 
 #include <Qt3DCore/qtransform.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qcullface.h>
-#include <Qt3DRenderer/qdepthtest.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/qcuboidmesh.h>
-#include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qopenglfilter.h>
-#include <Qt3DRenderer/qshaderprogram.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qcullface.h>
+#include <Qt3DRender/qdepthtest.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qtechnique.h>
+#include <Qt3DRender/qcuboidmesh.h>
+#include <Qt3DRender/qrenderpass.h>
+#include <Qt3DRender/qopenglfilter.h>
+#include <Qt3DRender/qshaderprogram.h>
 #include <Qt3DCore/qtranslatetransform.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h
index a3708a9f5..d0406466a 100644
--- a/src/render/defaults/qskyboxentity.h
+++ b/src/render/defaults/qskyboxentity.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_RENDER_QSKYBOXENTITY_H
 
 #include <Qt3DCore/qentity.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QSkyboxEntityPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity
+class QT3DRENDERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity
 {
     Q_OBJECT
 public: