Move Renderer specific classes into new folder

This is another step toward isolating the renderer from the render aspect

Change-Id: I4031675b961d6645b65bbe05cf62d150993038b0
Task-number: QTBUG-61151
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 25 insertions, 12 deletions

diff --git a/tests/auto/render/commons/testrenderer.cpp b/tests/auto/render/commons/testrenderer.cpp
index 5304ff142..277b2b99b 100644
--- a/tests/auto/render/commons/testrenderer.cpp
+++ b/tests/auto/render/commons/testrenderer.cpp
@@ -51,10 +51,12 @@ Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet TestRenderer::dirtyBit
     return m_changes;
 }
 
+#if defined(QT_BUILD_INTERNAL)
 void TestRenderer::clearDirtyBits(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes)
 {
     m_changes &= changes;
 }
+#endif
 
 void TestRenderer::resetDirty()
 {
diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index 26b7c6fc6..355331516 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -72,7 +72,9 @@ public:
 
     void markDirty(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes, Qt3DRender::Render::BackendNode *node) override;
     Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet dirtyBits() override;
+#if defined(QT_BUILD_INTERNAL)
     void clearDirtyBits(Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet changes) override;
+#endif
 
     void resetDirty();
     QVariant executeCommand(const QStringList &args) override;
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 7a71ae264..1a510d069 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -3,14 +3,11 @@ TEMPLATE = subdirs
 qtConfig(private_tests) {
     SUBDIRS += \
         entity \
-        renderqueue \
         renderpass \
         qgraphicsutils \
         shader \
         shaderbuilder \
         texture \
-        renderviewutils \
-        renderviews \
         material \
         vsyncframeadvanceservice \
         meshfunctors \
@@ -59,11 +56,6 @@ qtConfig(private_tests) {
         loadscenejob \
         qrendercapture \
         uniform \
-        graphicshelpergl3_3 \
-        graphicshelpergl3_2 \
-        graphicshelpergl2 \
-        sendrendercapturejob \
-        textures \
         qparameter \
         parameter \
         qtextureloader \
@@ -85,9 +77,6 @@ qtConfig(private_tests) {
         filterkey \
         qmesh \
         technique \
-        materialparametergathererjob \
-        renderviewbuilder \
-        filtercompatibletechniquejob \
         rendercapture \
         segmentvisitor \
         trianglevisitor \
@@ -97,7 +86,6 @@ qtConfig(private_tests) {
         qshaderprogrambuilder \
         coordinatereader \
         framegraphvisitor \
-        renderer \
         armature \
         skeleton \
         joint \
@@ -122,6 +110,27 @@ qtConfig(private_tests) {
         trianglesextractor \
         triangleboundingvolume \
     }
+}
+
+# Tests related to the OpenGL renderer
+QT_FOR_CONFIG += 3drender-private
+
+qtConfig(qt3d-opengl-renderer):qtConfig(private_tests) {
+
+    SUBDIRS += \
+        filtercompatibletechniquejob \
+        graphicshelpergl3_3 \
+        graphicshelpergl3_2 \
+        graphicshelpergl2 \
+        materialparametergathererjob \
+        textures \
+        scene2d \
+        renderer \
+        renderviewutils \
+        renderviews \
+        renderqueue \
+        renderviewbuilder \
+        sendrendercapturejob
 
     qtConfig(qt3d-extras) {
         SUBDIRS += \