Move Render aspect into the Qt3DRender namespace

Updated examples and tests accordingly.

Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

11 files changed, 130 insertions, 130 deletions

diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index dc04e0398..29330968b 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
@@ -38,18 +38,18 @@
 
 
 DeferredRenderer::DeferredRenderer(Qt3D::QNode *parent)
-    : Qt3D::QViewport(parent)
-    , m_sceneFilter(new Qt3D::QLayerFilter(this))
-    , m_screenQuadFilter(new Qt3D::QLayerFilter(this))
-    , m_clearScreenQuad(new Qt3D::QClearBuffer(m_screenQuadFilter))
-    , m_gBufferTargetSelector(new Qt3D::QRenderTargetSelector(m_sceneFilter))
-    , m_clearGBuffer(new Qt3D::QClearBuffer(m_gBufferTargetSelector))
-    , m_geometryPassFilter(new Qt3D::QRenderPassFilter(m_clearGBuffer))
-    , m_finalPassFilter(new Qt3D::QRenderPassFilter(m_clearScreenQuad))
-    , m_sceneCameraSelector(new Qt3D::QCameraSelector(m_geometryPassFilter))
+    : Qt3DRender::QViewport(parent)
+    , m_sceneFilter(new Qt3DRender::QLayerFilter(this))
+    , m_screenQuadFilter(new Qt3DRender::QLayerFilter(this))
+    , m_clearScreenQuad(new Qt3DRender::QClearBuffer(m_screenQuadFilter))
+    , m_gBufferTargetSelector(new Qt3DRender::QRenderTargetSelector(m_sceneFilter))
+    , m_clearGBuffer(new Qt3DRender::QClearBuffer(m_gBufferTargetSelector))
+    , m_geometryPassFilter(new Qt3DRender::QRenderPassFilter(m_clearGBuffer))
+    , m_finalPassFilter(new Qt3DRender::QRenderPassFilter(m_clearScreenQuad))
+    , m_sceneCameraSelector(new Qt3DRender::QCameraSelector(m_geometryPassFilter))
 {
-    m_clearGBuffer->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
-    m_clearScreenQuad->setBuffers(Qt3D::QClearBuffer::ColorDepthBuffer);
+    m_clearGBuffer->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
+    m_clearScreenQuad->setBuffers(Qt3DRender::QClearBuffer::ColorDepthBuffer);
 }
 
 void DeferredRenderer::setSceneCamera(Qt3D::QEntity *camera)
@@ -57,20 +57,20 @@ void DeferredRenderer::setSceneCamera(Qt3D::QEntity *camera)
     m_sceneCameraSelector->setCamera(camera);
 }
 
-void DeferredRenderer::setGBuffer(Qt3D::QRenderTarget *gBuffer)
+void DeferredRenderer::setGBuffer(Qt3DRender::QRenderTarget *gBuffer)
 {
     m_gBufferTargetSelector->setTarget(gBuffer);
 }
 
-void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria)
+void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
         m_geometryPassFilter->addInclude(c);
 }
 
-void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria)
+void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
         c->setParent(m_finalPassFilter);
 }
 
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 34c09175c..201614173 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
@@ -45,27 +45,27 @@
 #include <Qt3DRenderer/QCameraSelector>
 #include <Qt3DRenderer/QAnnotation>
 
-class DeferredRenderer : public Qt3D::QViewport
+class DeferredRenderer : public Qt3DRender::QViewport
 {
 public:
     explicit DeferredRenderer(Qt3D::QNode *parent = 0);
 
     void setSceneCamera(Qt3D::QEntity *camera);
-    void setGBuffer(Qt3D::QRenderTarget *gBuffer);
-    void setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria);
-    void setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria);
+    void setGBuffer(Qt3DRender::QRenderTarget *gBuffer);
+    void setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
+    void setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
     void setGBufferLayers(const QStringList &layerName);
     void setScreenQuadLayers(const QStringList &layerName);
 
 private:
-    Qt3D::QLayerFilter *m_sceneFilter;
-    Qt3D::QLayerFilter *m_screenQuadFilter;
-    Qt3D::QClearBuffer *m_clearScreenQuad;
-    Qt3D::QRenderTargetSelector *m_gBufferTargetSelector;
-    Qt3D::QClearBuffer *m_clearGBuffer;
-    Qt3D::QRenderPassFilter *m_geometryPassFilter;
-    Qt3D::QRenderPassFilter *m_finalPassFilter;
-    Qt3D::QCameraSelector *m_sceneCameraSelector;
+    Qt3DRender::QLayerFilter *m_sceneFilter;
+    Qt3DRender::QLayerFilter *m_screenQuadFilter;
+    Qt3DRender::QClearBuffer *m_clearScreenQuad;
+    Qt3DRender::QRenderTargetSelector *m_gBufferTargetSelector;
+    Qt3DRender::QClearBuffer *m_clearGBuffer;
+    Qt3DRender::QRenderPassFilter *m_geometryPassFilter;
+    Qt3DRender::QRenderPassFilter *m_finalPassFilter;
+    Qt3DRender::QCameraSelector *m_sceneCameraSelector;
 };
 
 #endif // DEFERREDRENDERER_H
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index 96134c297..d12cc1450 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -41,27 +41,27 @@
 #include <QUrl>
 
 FinalEffect::FinalEffect(Qt3D::QNode *parent)
-    : Qt3D::QEffect(parent)
-    , m_gl3Technique(new Qt3D::QTechnique())
-    , m_gl2Technique(new Qt3D::QTechnique())
-    , m_gl2Pass(new Qt3D::QRenderPass())
-    , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QAnnotation(this))
+    : Qt3DRender::QEffect(parent)
+    , m_gl3Technique(new Qt3DRender::QTechnique())
+    , m_gl2Technique(new Qt3DRender::QTechnique())
+    , m_gl2Pass(new Qt3DRender::QRenderPass())
+    , m_gl3Pass(new Qt3DRender::QRenderPass())
+    , m_passCriterion(new Qt3DRender::QAnnotation(this))
 {
-    m_gl3Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl3Technique->openGLFilter()->setMajorVersion(3);
     m_gl3Technique->openGLFilter()->setMinorVersion(1);
-    m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::Core);
+    m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::Core);
 
-    m_gl2Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl2Technique->openGLFilter()->setMajorVersion(2);
     m_gl2Technique->openGLFilter()->setMinorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
+    m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
 
     m_passCriterion->setName(QStringLiteral("pass"));
     m_passCriterion->setValue(QStringLiteral("final"));
 
-    Qt3D::QShaderProgram *gl3Shader = new Qt3D::QShaderProgram();
+    Qt3DRender::QShaderProgram *gl3Shader = new Qt3DRender::QShaderProgram();
     gl3Shader->setVertexShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.vert"))));
     gl3Shader->setFragmentShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.frag"))));
 
@@ -69,7 +69,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addPass(m_gl3Pass);
 
-    Qt3D::QShaderProgram *gl2Shader = new Qt3D::QShaderProgram();
+    Qt3DRender::QShaderProgram *gl2Shader = new Qt3DRender::QShaderProgram();
     gl2Shader->setVertexShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.vert"))));
     gl2Shader->setFragmentShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.frag"))));
 
@@ -81,7 +81,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QAnnotation *> FinalEffect::passCriteria() const
+QList<Qt3DRender::QAnnotation *> FinalEffect::passCriteria() const
 {
-    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
index 11fb4c6f3..9bd48cd9d 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
@@ -40,21 +40,21 @@
 #include <Qt3DRenderer/QEffect>
 #include <Qt3DRenderer/QTechnique>
 
-class FinalEffect : public Qt3D::QEffect
+class FinalEffect : public Qt3DRender::QEffect
 {
 public:
     explicit FinalEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QAnnotation *> passCriteria() const;
-    inline Qt3D::QTechnique *gl3Technique() const { return m_gl3Technique; }
-    inline Qt3D::QTechnique *gl2Technique() const { return m_gl2Technique; }
+    QList<Qt3DRender::QAnnotation *> passCriteria() const;
+    inline Qt3DRender::QTechnique *gl3Technique() const { return m_gl3Technique; }
+    inline Qt3DRender::QTechnique *gl2Technique() const { return m_gl2Technique; }
 
 private :
-    Qt3D::QTechnique *m_gl3Technique;
-    Qt3D::QTechnique *m_gl2Technique;
-    Qt3D::QRenderPass *m_gl2Pass;
-    Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QAnnotation *m_passCriterion;
+    Qt3DRender::QTechnique *m_gl3Technique;
+    Qt3DRender::QTechnique *m_gl2Technique;
+    Qt3DRender::QRenderPass *m_gl2Pass;
+    Qt3DRender::QRenderPass *m_gl3Pass;
+    Qt3DRender::QAnnotation *m_passCriterion;
 };
 
 #endif // FINALEFFECT_H
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
index a05adfc72..ab59cf692 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
@@ -37,20 +37,20 @@
 #include "gbuffer.h"
 
 GBuffer::GBuffer(Qt3D::QNode *parent)
-    : Qt3D::QRenderTarget(parent)
+    : Qt3DRender::QRenderTarget(parent)
 {
-    const Qt3D::QAbstractTextureProvider::TextureFormat formats[AttachmentsCount] = {
-        Qt3D::QAbstractTextureProvider::RGBA32F,
-        Qt3D::QAbstractTextureProvider::RGB32F,
-        Qt3D::QAbstractTextureProvider::RGB16F,
-        Qt3D::QAbstractTextureProvider::D32F
+    const Qt3DRender::QAbstractTextureProvider::TextureFormat formats[AttachmentsCount] = {
+        Qt3DRender::QAbstractTextureProvider::RGBA32F,
+        Qt3DRender::QAbstractTextureProvider::RGB32F,
+        Qt3DRender::QAbstractTextureProvider::RGB16F,
+        Qt3DRender::QAbstractTextureProvider::D32F
     };
 
-    const Qt3D::QRenderAttachment::RenderAttachmentType attachmentTypes[AttachmentsCount] = {
-        Qt3D::QRenderAttachment::ColorAttachment0,
-        Qt3D::QRenderAttachment::ColorAttachment1,
-        Qt3D::QRenderAttachment::ColorAttachment2,
-        Qt3D::QRenderAttachment::DepthAttachment
+    const Qt3DRender::QRenderAttachment::RenderAttachmentType attachmentTypes[AttachmentsCount] = {
+        Qt3DRender::QRenderAttachment::ColorAttachment0,
+        Qt3DRender::QRenderAttachment::ColorAttachment1,
+        Qt3DRender::QRenderAttachment::ColorAttachment2,
+        Qt3DRender::QRenderAttachment::DepthAttachment
     };
 
     const QString attachmentNames[AttachmentsCount] = {
@@ -61,16 +61,16 @@ GBuffer::GBuffer(Qt3D::QNode *parent)
     };
 
     for (int i = 0; i < AttachmentsCount; i++) {
-        Qt3D::QRenderAttachment *attachment = new Qt3D::QRenderAttachment(this);
+        Qt3DRender::QRenderAttachment *attachment = new Qt3DRender::QRenderAttachment(this);
 
-        m_textures[i] = new Qt3D::QTexture2D();
+        m_textures[i] = new Qt3DRender::QTexture2D();
         m_textures[i]->setFormat(formats[i]);
         m_textures[i]->setWidth(1024);
         m_textures[i]->setHeight(1024);
         m_textures[i]->setGenerateMipMaps(false);
-        m_textures[i]->setWrapMode(Qt3D::QTextureWrapMode(Qt3D::QTextureWrapMode::ClampToEdge));
-        m_textures[i]->setMinificationFilter(Qt3D::QAbstractTextureProvider::Linear);
-        m_textures[i]->setMagnificationFilter(Qt3D::QAbstractTextureProvider::Linear);
+        m_textures[i]->setWrapMode(Qt3DRender::QTextureWrapMode(Qt3DRender::QTextureWrapMode::ClampToEdge));
+        m_textures[i]->setMinificationFilter(Qt3DRender::QAbstractTextureProvider::Linear);
+        m_textures[i]->setMagnificationFilter(Qt3DRender::QAbstractTextureProvider::Linear);
 
         attachment->setTexture(m_textures[i]);
         attachment->setType(attachmentTypes[i]);
@@ -80,22 +80,22 @@ GBuffer::GBuffer(Qt3D::QNode *parent)
     }
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::colorTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::colorTexture() const
 {
     return m_textures[Color];
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::positionTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::positionTexture() const
 {
     return m_textures[Position];
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::normalTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::normalTexture() const
 {
     return m_textures[Normal];
 }
 
-Qt3D::QAbstractTextureProvider *GBuffer::depthTexture() const
+Qt3DRender::QAbstractTextureProvider *GBuffer::depthTexture() const
 {
     return m_textures[Depth];
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.h b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
index 1302fbb66..0f7d20c8f 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.h
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.h
@@ -41,7 +41,7 @@
 #include <Qt3DRenderer/qtexture.h>
 #include <Qt3DRenderer/QRenderAttachment>
 
-class GBuffer : public Qt3D::QRenderTarget
+class GBuffer : public Qt3DRender::QRenderTarget
 {
 public:
     explicit GBuffer(Qt3D::QNode *parent = 0);
@@ -54,14 +54,14 @@ public:
         AttachmentsCount
     };
 
-    Qt3D::QAbstractTextureProvider *colorTexture() const;
-    Qt3D::QAbstractTextureProvider *positionTexture() const;
-    Qt3D::QAbstractTextureProvider *normalTexture() const;
-    Qt3D::QAbstractTextureProvider *depthTexture() const;
+    Qt3DRender::QAbstractTextureProvider *colorTexture() const;
+    Qt3DRender::QAbstractTextureProvider *positionTexture() const;
+    Qt3DRender::QAbstractTextureProvider *normalTexture() const;
+    Qt3DRender::QAbstractTextureProvider *depthTexture() const;
 
 private:
-    Qt3D::QAbstractTextureProvider *m_textures[AttachmentsCount];
-    Qt3D::QRenderAttachment *m_attachments[AttachmentsCount];
+    Qt3DRender::QAbstractTextureProvider *m_textures[AttachmentsCount];
+    Qt3DRender::QRenderAttachment *m_attachments[AttachmentsCount];
 };
 
 #endif // GBUFFER_H
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index 129d3174d..b82353dc1 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -68,7 +68,7 @@ int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
 
-    Qt3D::QWindow view;
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect();
     view.registerAspect(input);
 
@@ -81,22 +81,22 @@ int main(int ac, char **av)
     FinalEffect *finalEffect = new FinalEffect();
     SceneEffect *sceneEffect = new SceneEffect();
 
-    Qt3D::QSphereMesh *sphereMesh = new Qt3D::QSphereMesh();
+    Qt3DRender::QSphereMesh *sphereMesh = new Qt3DRender::QSphereMesh();
     sphereMesh->setRings(50);
     sphereMesh->setSlices(100);
 
-    Qt3D::QLayer *sceneLayer = new Qt3D::QLayer();
+    Qt3DRender::QLayer *sceneLayer = new Qt3DRender::QLayer();
     sceneLayer->setNames(QStringList("scene"));
 
-    Qt3D::QLayer *quadLayer = new Qt3D::QLayer();
+    Qt3DRender::QLayer *quadLayer = new Qt3DRender::QLayer();
     quadLayer->setNames(QStringList("screenQuad"));
 
-    Qt3D::QPlaneMesh *planeMesh = new Qt3D::QPlaneMesh();
+    Qt3DRender::QPlaneMesh *planeMesh = new Qt3DRender::QPlaneMesh();
     planeMesh->setMeshResolution(QSize(2, 2));
     planeMesh->setWidth(2.0f);
     planeMesh->setHeight(2.0f);
 
-    Qt3D::QPointLight *light1 = new Qt3D::QPointLight();
+    Qt3DRender::QPointLight *light1 = new Qt3DRender::QPointLight();
     light1->setColor(Qt::white);
     light1->setIntensity(1.5f);
 
@@ -117,7 +117,7 @@ int main(int ac, char **av)
     input->setCamera(camera);
 
     // FrameGraph
-    Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph();
+    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph();
     DeferredRenderer *deferredRenderer = new DeferredRenderer();
     deferredRenderer->setClearColor(Qt::black);
     deferredRenderer->setRect(QRectF(0.0f, 0.0f, 1.0f, 1.0f));
@@ -133,17 +133,17 @@ int main(int ac, char **av)
 
     // Scene Content
     Qt3D::QEntity *sphereOne = new Qt3D::QEntity(rootEntity);
-    Qt3D::QMaterial *sphereOneMaterial = new Qt3D::QMaterial();
+    Qt3DRender::QMaterial *sphereOneMaterial = new Qt3DRender::QMaterial();
 
     sphereOneMaterial->setEffect(sceneEffect);
-    sphereOneMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("meshColor"), QColor(Qt::blue)));
+    sphereOneMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::blue)));
 
     Qt3D::QTranslateTransform *sphereOneTranslate = new Qt3D::QTranslateTransform();
     sphereOneTranslate->setDx(-10.0f);
     sphereOneTranslate->setDy(0.0f);
     sphereOneTranslate->setDz(25.0f);
 
-    Qt3D::QPointLight *light2 = new Qt3D::QPointLight();
+    Qt3DRender::QPointLight *light2 = new Qt3DRender::QPointLight();
     light2->setColor(Qt::white);
     light2->setIntensity(1.5f);
 
@@ -154,11 +154,11 @@ int main(int ac, char **av)
     sphereOne->addComponent(light2);
 
     Qt3D::QEntity *sphereTwo = new Qt3D::QEntity(rootEntity);
-    Qt3D::QMaterial *sphereTwoMaterial = new Qt3D::QMaterial();
+    Qt3DRender::QMaterial *sphereTwoMaterial = new Qt3DRender::QMaterial();
     sphereTwoMaterial->setEffect(sceneEffect);
-    sphereTwoMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("meshColor"), QColor(Qt::yellow)));
+    sphereTwoMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("meshColor"), QColor(Qt::yellow)));
 
-    Qt3D::QPointLight *light3 = new Qt3D::QPointLight();
+    Qt3DRender::QPointLight *light3 = new Qt3DRender::QPointLight();
     light3->setColor(Qt::blue);
     light3->setIntensity(0.5f);
 
@@ -169,18 +169,18 @@ int main(int ac, char **av)
 
     // Screen Quad
     Qt3D::QEntity *screenQuad = new Qt3D::QEntity(rootEntity);
-    Qt3D::QMaterial *screenQuadMaterial = new Qt3D::QMaterial();
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("position"), gBuffer->positionTexture()));
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("normal"), gBuffer->normalTexture()));
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("color"), gBuffer->colorTexture()));
-    screenQuadMaterial->addParameter(new Qt3D::QParameter(QStringLiteral("winSize"), QSize(1024, 1024)));
+    Qt3DRender::QMaterial *screenQuadMaterial = new Qt3DRender::QMaterial();
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("position"), gBuffer->positionTexture()));
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("normal"), gBuffer->normalTexture()));
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("color"), gBuffer->colorTexture()));
+    screenQuadMaterial->addParameter(new Qt3DRender::QParameter(QStringLiteral("winSize"), QSize(1024, 1024)));
     PointLightBlock *lightsData = new PointLightBlock(screenQuadMaterial);
     lightsData->addLight(light1);
     lightsData->addLight(light2);
     lightsData->addLight(light3);
 
-    finalEffect->gl3Technique()->addParameter(new Qt3D::QParameter(QStringLiteral("PointLightBlock"), QVariant::fromValue(lightsData)));
-    finalEffect->gl2Technique()->addParameter(new Qt3D::QParameter(QStringLiteral("pointLights"), QVariant::fromValue(lightsData)));
+    finalEffect->gl3Technique()->addParameter(new Qt3DRender::QParameter(QStringLiteral("PointLightBlock"), QVariant::fromValue(lightsData)));
+    finalEffect->gl2Technique()->addParameter(new Qt3DRender::QParameter(QStringLiteral("pointLights"), QVariant::fromValue(lightsData)));
     screenQuadMaterial->setEffect(finalEffect);
 
     Qt3D::QRotateTransform *screenPlaneRotation = new Qt3D::QRotateTransform();
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
index 07d77fd7a..5186d0f1b 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.cpp
@@ -37,7 +37,7 @@
 #include "pointlightblock.h"
 
 PointLightBlock::PointLightBlock(Qt3D::QNode *parent)
-    : Qt3D::QShaderData(parent)
+    : Qt3DRender::QShaderData(parent)
 {
 
 }
@@ -46,12 +46,12 @@ PointLightBlock::~PointLightBlock()
 {
 }
 
-QList<Qt3D::QShaderData *> PointLightBlock::lights() const
+QList<Qt3DRender::QShaderData *> PointLightBlock::lights() const
 {
     return m_lights;
 }
 
-void PointLightBlock::addLight(Qt3D::QShaderData *light)
+void PointLightBlock::addLight(Qt3DRender::QShaderData *light)
 {
     m_lights.append(light);
     emit lightsChanged();
diff --git a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
index 8fb470504..6e8d3639f 100644
--- a/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
+++ b/examples/qt3d/deferred-renderer-cpp/pointlightblock.h
@@ -39,7 +39,7 @@
 
 #include <Qt3DRenderer/QShaderData>
 
-class PointLightBlock : public Qt3D::QShaderData
+class PointLightBlock : public Qt3DRender::QShaderData
 {
     Q_OBJECT
     Q_PROPERTY(QList<QShaderData *> lights READ lights NOTIFY lightsChanged)
@@ -47,14 +47,14 @@ public:
     explicit PointLightBlock(Qt3D::QNode *parent = 0);
     ~PointLightBlock();
 
-    QList<QShaderData *> lights() const;
-    void addLight(QShaderData *light);
+    QList<Qt3DRender::QShaderData *> lights() const;
+    void addLight(Qt3DRender::QShaderData *light);
 
 Q_SIGNALS:
     void lightsChanged();
 
 private:
-    QList<Qt3D::QShaderData *> m_lights;
+    QList<Qt3DRender::QShaderData *> m_lights;
 };
 
 #endif // POINTLIGHTBLOCK_H
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 98eb677ed..a4c208905 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -41,39 +41,39 @@
 #include <QUrl>
 
 SceneEffect::SceneEffect(Qt3D::QNode *parent)
-    : Qt3D::QEffect(parent)
-    , m_gl3Technique(new Qt3D::QTechnique())
-    , m_gl2Technique(new Qt3D::QTechnique())
-    , m_gl2Pass(new Qt3D::QRenderPass())
-    , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QAnnotation(this))
+    : Qt3DRender::QEffect(parent)
+    , m_gl3Technique(new Qt3DRender::QTechnique())
+    , m_gl2Technique(new Qt3DRender::QTechnique())
+    , m_gl2Pass(new Qt3DRender::QRenderPass())
+    , m_gl3Pass(new Qt3DRender::QRenderPass())
+    , m_passCriterion(new Qt3DRender::QAnnotation(this))
 {
 
-    m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
-    m_gl3Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
+    m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl3Technique->openGLFilter()->setMajorVersion(3);
     m_gl3Technique->openGLFilter()->setMinorVersion(3);
 
-    m_gl2Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
+    m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
     m_gl2Technique->openGLFilter()->setMajorVersion(2);
     m_gl2Technique->openGLFilter()->setMinorVersion(0);
-    m_gl2Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
+    m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
 
 
     m_passCriterion->setName(QStringLiteral("pass"));
     m_passCriterion->setValue(QStringLiteral("geometry"));
 
-    Qt3D::QShaderProgram *gl3Shader = new Qt3D::QShaderProgram();
-    gl3Shader->setVertexShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.vert"))));
-    gl3Shader->setFragmentShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.frag"))));
+    Qt3DRender::QShaderProgram *gl3Shader = new Qt3DRender::QShaderProgram();
+    gl3Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.vert"))));
+    gl3Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.frag"))));
 
     m_gl3Pass->addAnnotation(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addPass(m_gl3Pass);
 
-    Qt3D::QShaderProgram *gl2Shader = new Qt3D::QShaderProgram();
-    gl2Shader->setVertexShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.vert"))));
-    gl2Shader->setFragmentShaderCode(Qt3D::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.frag"))));
+    Qt3DRender::QShaderProgram *gl2Shader = new Qt3DRender::QShaderProgram();
+    gl2Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.vert"))));
+    gl2Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.frag"))));
 
     m_gl2Pass->addAnnotation(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
@@ -83,7 +83,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QAnnotation *> SceneEffect::passCriteria() const
+QList<Qt3DRender::QAnnotation *> SceneEffect::passCriteria() const
 {
-    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
index 18a869bfe..9f88aef31 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
@@ -40,19 +40,19 @@
 #include <Qt3DRenderer/QEffect>
 #include <Qt3DRenderer/QTechnique>
 
-class SceneEffect : public Qt3D::QEffect
+class SceneEffect : public Qt3DRender::QEffect
 {
 public:
     explicit SceneEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QAnnotation *> passCriteria() const;
+    QList<Qt3DRender::QAnnotation *> passCriteria() const;
 
 private:
-    Qt3D::QTechnique *m_gl3Technique;
-    Qt3D::QTechnique *m_gl2Technique;
-    Qt3D::QRenderPass *m_gl2Pass;
-    Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QAnnotation *m_passCriterion;
+    Qt3DRender::QTechnique *m_gl3Technique;
+    Qt3DRender::QTechnique *m_gl2Technique;
+    Qt3DRender::QRenderPass *m_gl2Pass;
+    Qt3DRender::QRenderPass *m_gl3Pass;
+    Qt3DRender::QAnnotation *m_passCriterion;
 };
 
 #endif // SCENEEFFECT_H