Make the OpenGL renderer a plugin

By default the QRenderAspect will try to load this plugin

Change-Id: Ie55e207fb8e6d0b64f717bbb99699eb669eaa3f2
Task-number: QTBUG-61151
Reviewed-by: Mike Krus <mike.krus@kdab.com>

27 files changed, 26 insertions, 27 deletions

diff --git a/src/render/framegraph/blitframebuffer_p.h b/src/render/framegraph/blitframebuffer_p.h
index fa9ddacd9..773833eb5 100644
--- a/src/render/framegraph/blitframebuffer_p.h
+++ b/src/render/framegraph/blitframebuffer_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT BlitFramebuffer : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT BlitFramebuffer : public FrameGraphNode
 {
 public:
     BlitFramebuffer();
diff --git a/src/render/framegraph/buffercapture_p.h b/src/render/framegraph/buffercapture_p.h
index d638f35d5..dfade50eb 100644
--- a/src/render/framegraph/buffercapture_p.h
+++ b/src/render/framegraph/buffercapture_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT BufferCapture : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT BufferCapture : public FrameGraphNode
 {
 public:
     BufferCapture();
diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp
index 3beb0ef71..00772c502 100644
--- a/src/render/framegraph/cameraselectornode.cpp
+++ b/src/render/framegraph/cameraselectornode.cpp
@@ -39,7 +39,8 @@
 
 #include "cameraselectornode_p.h"
 #include <Qt3DRender/private/qcameraselector_p.h>
-#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/private/abstractrenderer_p.h>
+#include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DRender/private/renderlogging_p.h>
 
diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h
index dd7e050d0..24590f960 100644
--- a/src/render/framegraph/cameraselectornode_p.h
+++ b/src/render/framegraph/cameraselectornode_p.h
@@ -64,7 +64,7 @@ namespace Render {
 
 class Renderer;
 
-class CameraSelector : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT CameraSelector : public FrameGraphNode
 {
 public:
     CameraSelector();
diff --git a/src/render/framegraph/clearbuffers_p.h b/src/render/framegraph/clearbuffers_p.h
index ca55d2a98..746d58da7 100644
--- a/src/render/framegraph/clearbuffers_p.h
+++ b/src/render/framegraph/clearbuffers_p.h
@@ -62,7 +62,7 @@ namespace Render {
 
 class FrameGraphManager;
 
-class ClearBuffers : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT ClearBuffers : public FrameGraphNode
 {
 public:
     ClearBuffers();
diff --git a/src/render/framegraph/dispatchcompute_p.h b/src/render/framegraph/dispatchcompute_p.h
index 24a641938..7df8db1da 100644
--- a/src/render/framegraph/dispatchcompute_p.h
+++ b/src/render/framegraph/dispatchcompute_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class DispatchCompute : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT DispatchCompute : public FrameGraphNode
 {
 public:
     DispatchCompute();
diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index 40d8fca3d..92116af7d 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "framegraphnode_p.h"
-#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/private/abstractrenderer_p.h>
 #include <Qt3DRender/private/nodemanagers_p.h>
 #include <Qt3DRender/qframegraphnodecreatedchange.h>
 
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index 55bede5fd..92d7ae2f1 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -74,7 +74,7 @@ namespace Render {
 
 class FrameGraphManager;
 
-class Q_AUTOTEST_EXPORT FrameGraphNode : public BackendNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT FrameGraphNode : public BackendNode
 {
 public:
     FrameGraphNode();
diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp
index 9af0297a0..b0eb1ac00 100644
--- a/src/render/framegraph/framegraphvisitor.cpp
+++ b/src/render/framegraph/framegraphvisitor.cpp
@@ -42,7 +42,7 @@
 
 #include "framegraphnode_p.h"
 #include "subtreeenabler_p.h"
-#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/private/abstractrenderer_p.h>
 #include <Qt3DRender/private/managers_p.h>
 #include <QThreadPool>
 
diff --git a/src/render/framegraph/framegraphvisitor_p.h b/src/render/framegraph/framegraphvisitor_p.h
index 5706a169d..0bb6cf0d4 100644
--- a/src/render/framegraph/framegraphvisitor_p.h
+++ b/src/render/framegraph/framegraphvisitor_p.h
@@ -54,6 +54,7 @@
 #include <qglobal.h>
 
 #include <Qt3DCore/qaspectjob.h>
+#include <Qt3DRender/private/qt3drender_global_p.h>
 
 #include <QVector>
 
@@ -66,7 +67,7 @@ class FrameGraphNode;
 class Renderer;
 class FrameGraphManager;
 
-class Q_AUTOTEST_EXPORT FrameGraphVisitor
+class Q_3DRENDERSHARED_PRIVATE_EXPORT FrameGraphVisitor
 {
 public:
     explicit FrameGraphVisitor(const FrameGraphManager *nodeManager);
diff --git a/src/render/framegraph/frustumculling_p.h b/src/render/framegraph/frustumculling_p.h
index 7f9959c6e..ac11b7306 100644
--- a/src/render/framegraph/frustumculling_p.h
+++ b/src/render/framegraph/frustumculling_p.h
@@ -59,7 +59,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class FrustumCulling : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT FrustumCulling : public FrameGraphNode
 {
 public:
     FrustumCulling();
diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index 27cdc49d3..f075d5ec4 100644
--- a/src/render/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
@@ -64,7 +64,7 @@ namespace Render {
 
 class Renderer;
 
-class LayerFilterNode : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT LayerFilterNode : public FrameGraphNode
 {
 public:
     LayerFilterNode();
diff --git a/src/render/framegraph/memorybarrier_p.h b/src/render/framegraph/memorybarrier_p.h
index ce545cd09..78bb91c40 100644
--- a/src/render/framegraph/memorybarrier_p.h
+++ b/src/render/framegraph/memorybarrier_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT MemoryBarrier : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT MemoryBarrier : public FrameGraphNode
 {
 public:
     MemoryBarrier();
diff --git a/src/render/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h
index ae9fa6713..ace625250 100644
--- a/src/render/framegraph/nodraw_p.h
+++ b/src/render/framegraph/nodraw_p.h
@@ -59,7 +59,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class NoDraw : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT NoDraw : public FrameGraphNode
 {
 public:
     NoDraw();
diff --git a/src/render/framegraph/proximityfilter_p.h b/src/render/framegraph/proximityfilter_p.h
index 5c2f7ad66..27d89f76d 100644
--- a/src/render/framegraph/proximityfilter_p.h
+++ b/src/render/framegraph/proximityfilter_p.h
@@ -59,7 +59,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT ProximityFilter : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT ProximityFilter : public FrameGraphNode
 {
 public:
     ProximityFilter();
diff --git a/src/render/framegraph/rendercapture_p.h b/src/render/framegraph/rendercapture_p.h
index 5714fb44d..f2a2a55b7 100644
--- a/src/render/framegraph/rendercapture_p.h
+++ b/src/render/framegraph/rendercapture_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT RenderCapture : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT RenderCapture : public FrameGraphNode
 {
 public:
     RenderCapture();
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index 157a162bb..c9084573e 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -67,7 +67,7 @@ class QHandle;
 
 namespace Render {
 
-class RenderPassFilter : public Render::FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT RenderPassFilter : public Render::FrameGraphNode
 {
 public:
     RenderPassFilter();
diff --git a/src/render/framegraph/rendersurfaceselector.cpp b/src/render/framegraph/rendersurfaceselector.cpp
index a1e639df5..c7e46efa7 100644
--- a/src/render/framegraph/rendersurfaceselector.cpp
+++ b/src/render/framegraph/rendersurfaceselector.cpp
@@ -40,7 +40,6 @@
 #include "rendersurfaceselector_p.h"
 #include <Qt3DRender/qrendersurfaceselector.h>
 #include <Qt3DRender/private/qrendersurfaceselector_p.h>
-
 #include <QtGui/qwindow.h>
 #include <QtGui/qscreen.h>
 #include <QtGui/qoffscreensurface.h>
diff --git a/src/render/framegraph/rendersurfaceselector_p.h b/src/render/framegraph/rendersurfaceselector_p.h
index f1a139e84..3378ececa 100644
--- a/src/render/framegraph/rendersurfaceselector_p.h
+++ b/src/render/framegraph/rendersurfaceselector_p.h
@@ -60,7 +60,7 @@ class QSurface;
 namespace Qt3DRender {
 namespace Render {
 
-class RenderSurfaceSelector : public Qt3DRender::Render::FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT RenderSurfaceSelector : public Qt3DRender::Render::FrameGraphNode
 {
 public:
     RenderSurfaceSelector();
diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp
index 614a749a5..f32b8c7d9 100644
--- a/src/render/framegraph/rendertargetselectornode.cpp
+++ b/src/render/framegraph/rendertargetselectornode.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 
 #include "rendertargetselectornode_p.h"
-#include <Qt3DRender/private/renderer_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DRender/qrendertargetselector.h>
 #include <Qt3DRender/private/qrendertargetselector_p.h>
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 232ee9ecc..04032045a 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -61,7 +61,7 @@ class QRenderTargetSelector;
 
 namespace Render {
 
-class RenderTargetSelector : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT RenderTargetSelector : public FrameGraphNode
 {
 public:
     RenderTargetSelector();
diff --git a/src/render/framegraph/setfence_p.h b/src/render/framegraph/setfence_p.h
index 31072581c..0f54d65ee 100644
--- a/src/render/framegraph/setfence_p.h
+++ b/src/render/framegraph/setfence_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT SetFence : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT SetFence : public FrameGraphNode
 {
 public:
     SetFence();
diff --git a/src/render/framegraph/sortpolicy_p.h b/src/render/framegraph/sortpolicy_p.h
index 8d572ead7..2015adf87 100644
--- a/src/render/framegraph/sortpolicy_p.h
+++ b/src/render/framegraph/sortpolicy_p.h
@@ -60,7 +60,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT SortPolicy : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT SortPolicy : public FrameGraphNode
 {
 public:
     SortPolicy();
diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index 5081f3215..618b52338 100644
--- a/src/render/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
@@ -59,7 +59,7 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class StateSetNode : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT StateSetNode : public FrameGraphNode
 {
 public:
     StateSetNode();
diff --git a/src/render/framegraph/subtreeenabler.cpp b/src/render/framegraph/subtreeenabler.cpp
index 4d912dc1d..37989df1a 100644
--- a/src/render/framegraph/subtreeenabler.cpp
+++ b/src/render/framegraph/subtreeenabler.cpp
@@ -39,7 +39,6 @@
 
 #include "subtreeenabler_p.h"
 #include <Qt3DRender/private/qsubtreeenabler_p.h>
-#include <Qt3DCore/qpropertyupdatedchange.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index e424e37e5..2e71e31d4 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -70,7 +70,7 @@ class QHandle;
 
 namespace Render {
 
-class TechniqueFilter
+class Q_3DRENDERSHARED_PRIVATE_EXPORT TechniqueFilter
         : public FrameGraphNode
 {
 public:
diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index 3e291a9da..f673b1e21 100644
--- a/src/render/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
@@ -64,7 +64,7 @@ namespace Render {
 
 class Renderer;
 
-class Q_AUTOTEST_EXPORT ViewportNode : public FrameGraphNode
+class Q_3DRENDERSHARED_PRIVATE_EXPORT ViewportNode : public FrameGraphNode
 {
 public:
     ViewportNode();