Move RHI command executer to separate namespace

Clashes with same class in GL plugin when using static builds (iOS).
I have no idea why it wasn't a problem before...

Task-number: QTBUG-103218
Change-Id: I4437c39fc2269c8e7461ca1ab5dc7a0284135cd1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
(cherry picked from commit c08b0234f0e7df0e28de969dcd1c4494fe2de3b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 11 insertions, 7 deletions

diff --git a/src/plugins/renderers/rhi/renderer/commandexecuter.cpp b/src/plugins/renderers/rhi/renderer/commandexecuter.cpp
index 9cac6f16b..359e377bc 100644
--- a/src/plugins/renderers/rhi/renderer/commandexecuter.cpp
+++ b/src/plugins/renderers/rhi/renderer/commandexecuter.cpp
@@ -58,10 +58,12 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-namespace Debug {
+namespace DebugRhi {
 
 namespace {
 
+#if 0 // unused for now
+
 template<typename Type>
 QJsonObject typeToJsonObj(const Type &) noexcept
 {
@@ -298,6 +300,8 @@ QJsonObject parameterPackToJson(const Render::Rhi::ShaderParameterPack &pack) no
     return obj;
 }
 
+#endif // 0
+
 } // anonymous
 
 CommandExecuter::CommandExecuter(Render::Rhi::Renderer *renderer) : m_renderer(renderer) { }
@@ -398,7 +402,7 @@ QVariant CommandExecuter::executeCommand(const QStringList &args)
     return QVariant();
 }
 
-} // Debug
+} // DebugRhi
 
 } // Qt3DRenderer
 
diff --git a/src/plugins/renderers/rhi/renderer/commandexecuter_p.h b/src/plugins/renderers/rhi/renderer/commandexecuter_p.h
index 1cd44874b..e683253a7 100644
--- a/src/plugins/renderers/rhi/renderer/commandexecuter_p.h
+++ b/src/plugins/renderers/rhi/renderer/commandexecuter_p.h
@@ -75,7 +75,7 @@ class RenderView;
 } // Rhi
 } // Render
 
-namespace Debug {
+namespace DebugRhi {
 
 class CommandExecuter
 {
@@ -92,7 +92,7 @@ private:
     QMutex m_pendingCommandsMutex;
 };
 
-} // Debug
+} // DebugRhi
 
 } // Qt3DRender
 
diff --git a/src/plugins/renderers/rhi/renderer/renderer.cpp b/src/plugins/renderers/rhi/renderer/renderer.cpp
index 47839b5b2..7774c91fe 100644
--- a/src/plugins/renderers/rhi/renderer/renderer.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderer.cpp
@@ -266,7 +266,7 @@ Renderer::Renderer()
               JobTypes::DirtyShaderGathering)),
       m_ownedContext(false),
       m_RHIResourceManagers(nullptr),
-      m_commandExecuter(new Qt3DRender::Debug::CommandExecuter(this)),
+      m_commandExecuter(new Qt3DRender::DebugRhi::CommandExecuter(this)),
       m_shouldSwapBuffers(true)
 {
     std::fill_n(m_textureTransform, 4, 0.f);
diff --git a/src/plugins/renderers/rhi/renderer/renderer_p.h b/src/plugins/renderers/rhi/renderer/renderer_p.h
index cb2137d95..1c89bd52b 100644
--- a/src/plugins/renderers/rhi/renderer/renderer_p.h
+++ b/src/plugins/renderers/rhi/renderer/renderer_p.h
@@ -118,7 +118,7 @@ class QAbstractShapeMesh;
 struct GraphicsApiFilterData;
 class QSceneImporter;
 
-namespace Debug {
+namespace DebugRhi {
 class CommandExecuter;
 }
 
@@ -389,7 +389,7 @@ private:
     RHIResourceManagers *m_RHIResourceManagers;
     QMutex m_offscreenSurfaceMutex;
 
-    QScopedPointer<Qt3DRender::Debug::CommandExecuter> m_commandExecuter;
+    QScopedPointer<Qt3DRender::DebugRhi::CommandExecuter> m_commandExecuter;
 
 #ifdef QT_BUILD_INTERNAL
     friend class ::tst_Renderer;