12 files changed, 36 insertions, 15 deletions
diff --git a/src/render/backend/backendnode.cpp b/src/render/backend/backendnode.cpp
index 7ad6e46cf..06e505888 100644
--- a/src/render/backend/backendnode.cpp
+++ b/src/render/backend/backendnode.cpp
@@ -10,11 +10,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
+
 BackendNode::BackendNode(Mode mode)
     : QBackendNode(mode)
     , m_renderer(nullptr)
diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp
index 22f693317..374abec47 100644
--- a/src/render/backend/cameralens.cpp
+++ b/src/render/backend/cameralens.cpp
@@ -19,11 +19,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
 
 namespace {
 
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index e83b98e29..2f14e23e7 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -34,11 +34,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
 
 EntityPrivate::EntityPrivate()
     : Qt3DCore::QBackendNodePrivate(Entity::ReadOnly)
diff --git a/src/render/backend/entityaccumulator.cpp b/src/render/backend/entityaccumulator.cpp
index e1b84c0af..43dff651c 100644
--- a/src/render/backend/entityaccumulator.cpp
+++ b/src/render/backend/entityaccumulator.cpp
@@ -4,8 +4,10 @@
 #include "entityaccumulator_p.h"
 #include "entityvisitor_p.h"
 
-QT_USE_NAMESPACE
-using namespace Qt3DRender::Render;
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+namespace Render {
 
 namespace {
 
@@ -61,3 +63,8 @@ QList<Entity *> EntityAccumulator::apply(Entity *root) const
     a.apply(root);
     return a.m_entities;
 }
+
+} // namespace Render
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
diff --git a/src/render/backend/entityvisitor.cpp b/src/render/backend/entityvisitor.cpp
index e0e392159..835512e3a 100644
--- a/src/render/backend/entityvisitor.cpp
+++ b/src/render/backend/entityvisitor.cpp
@@ -5,8 +5,10 @@
 #include <Qt3DRender/private/managers_p.h>
 #include <Qt3DRender/private/nodemanagers_p.h>
 
-QT_USE_NAMESPACE
-using namespace Qt3DRender::Render;
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+namespace Render {
 
 EntityVisitor::EntityVisitor(NodeManagers *manager)
     : m_manager(manager)
@@ -75,3 +77,8 @@ bool EntityVisitor::apply(Entity *root) {
 
     return true;
 }
+
+} // namespace Render
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
diff --git a/src/render/backend/layer.cpp b/src/render/backend/layer.cpp
index 3cc141e32..0cdf0b938 100644
--- a/src/render/backend/layer.cpp
+++ b/src/render/backend/layer.cpp
@@ -9,11 +9,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
+
 Layer::Layer()
     : BackendNode()
     , m_recursive(false)
diff --git a/src/render/backend/levelofdetail.cpp b/src/render/backend/levelofdetail.cpp
index ad800ffd4..517c85d64 100644
--- a/src/render/backend/levelofdetail.cpp
+++ b/src/render/backend/levelofdetail.cpp
@@ -10,11 +10,11 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
-
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
+
 LevelOfDetail::LevelOfDetail()
     : BackendNode(BackendNode::ReadWrite)
     , m_currentIndex(0)
diff --git a/src/render/backend/rendersettings.cpp b/src/render/backend/rendersettings.cpp
index ab2cef42e..70d6425fd 100644
--- a/src/render/backend/rendersettings.cpp
+++ b/src/render/backend/rendersettings.cpp
@@ -10,11 +10,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
+
 RenderSettings::RenderSettings()
     : BackendNode()
     , m_renderPolicy(QRenderSettings::OnDemand)
diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index 5db06e929..8d7463e4f 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -10,11 +10,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
+
 RenderTarget::RenderTarget()
     : BackendNode()
     , m_dirty(false)
diff --git a/src/render/backend/rendertargetoutput.cpp b/src/render/backend/rendertargetoutput.cpp
index 045ab6c3d..37bbd1c86 100644
--- a/src/render/backend/rendertargetoutput.cpp
+++ b/src/render/backend/rendertargetoutput.cpp
@@ -8,11 +8,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
+
 RenderTargetOutput::RenderTargetOutput()
     : BackendNode()
 {
diff --git a/src/render/backend/transform.cpp b/src/render/backend/transform.cpp
index bca31a8ef..629ef51b3 100644
--- a/src/render/backend/transform.cpp
+++ b/src/render/backend/transform.cpp
@@ -10,11 +10,12 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
 
+using namespace Qt3DCore;
+
 Transform::Transform()
     : BackendNode(ReadWrite)
     , m_rotation()
diff --git a/src/render/backend/trianglesvisitor.cpp b/src/render/backend/trianglesvisitor.cpp
index 54172bdf4..b5b7e2664 100644
--- a/src/render/backend/trianglesvisitor.cpp
+++ b/src/render/backend/trianglesvisitor.cpp
@@ -18,12 +18,13 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
 namespace Render {
 
+using namespace Qt3DCore;
+
 namespace {
 
 bool isTriangleBased(Qt3DRender::QGeometryRenderer::PrimitiveType type) noexcept