Fix exposure of privately used modulev5.15.0-rc2v5.15.0

The QtOpenGLExtensions was exposed in the public library
interface of QtQuick3D causing it to be linked into user applications,
the effect of this is that applications built (in debug mode) with Qt from
our binary installer will fail to build, as the build system will attempt
to pull in the debug version of QtOpenGLExtensions, which is not shipped
with the binary installed version of Qt (that is a separate issue).

Fixes: QTBUG-83184
Change-Id: Ib5c192fdf0c0297ae06920b39712f565a0bc2770
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Andy Nichols <[email protected]>

11 files changed, 28 insertions, 7 deletions

diff --git a/src/render/backends/gl/qssgrenderbackendgl3.cpp b/src/render/backends/gl/qssgrenderbackendgl3.cpp
index ef187286..83fa6b67 100644
--- a/src/render/backends/gl/qssgrenderbackendgl3.cpp
+++ b/src/render/backends/gl/qssgrenderbackendgl3.cpp
@@ -32,6 +32,7 @@
 #include <QtQuick3DRender/private/qssgrenderbackendinputassemblergl_p.h>
 #include <QtQuick3DRender/private/qssgrenderbackendrenderstatesgl_p.h>
 #include <QtQuick3DRender/private/qssgrenderbackendshaderprogramgl_p.h>
+#include <QtQuick3DRender/private/qssgopenglextensions_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/backends/gl/qssgrenderbackendgl3_p.h b/src/render/backends/gl/qssgrenderbackendgl3_p.h
index cc7856f3..a2c846fb 100644
--- a/src/render/backends/gl/qssgrenderbackendgl3_p.h
+++ b/src/render/backends/gl/qssgrenderbackendgl3_p.h
@@ -47,16 +47,23 @@
 
 #include <QtQuick3DRender/private/qssgrenderbasetypes_p.h>
 #include <QtQuick3DRender/private/qssgrenderbackendglbase_p.h>
-#include <QtQuick3DRender/private/qssgopenglextensions_p.h>
 
 #include <QtGui/QOpenGLExtraFunctions>
-#include <QtOpenGLExtensions/QtOpenGLExtensions>
 
 QT_BEGIN_NAMESPACE
 
 ///< forward declaration
 class QSSGRenderBackendMiscStateGL;
 
+#if defined(QT_OPENGL_ES_2)
+    class QSSGOpenGLES2Extensions;
+#else
+    class QOpenGLExtension_ARB_timer_query;
+    class QOpenGLExtension_ARB_tessellation_shader;
+    class QOpenGLExtension_ARB_texture_multisample;
+    class QSSGOpenGLExtensions;
+#endif
+
 namespace QSSGGlExtStrings {
 QByteArray extsAstcHDR();
 QByteArray extsAstcLDR();
diff --git a/src/render/backends/gl/qssgrenderbackendgl4.cpp b/src/render/backends/gl/qssgrenderbackendgl4.cpp
index 0a97c39e..648a4b73 100644
--- a/src/render/backends/gl/qssgrenderbackendgl4.cpp
+++ b/src/render/backends/gl/qssgrenderbackendgl4.cpp
@@ -32,6 +32,8 @@
 #include <QtQuick3DRender/private/qssgrenderbackendinputassemblergl_p.h>
 #include <QtQuick3DRender/private/qssgrenderbackendshaderprogramgl_p.h>
 
+#include <QtQuick3DRender/private/qssgopenglextensions_p.h>
+
 QT_BEGIN_NAMESPACE
 
 #ifdef RENDER_BACKEND_LOG_GL_ERRORS
diff --git a/src/render/backends/gl/qssgrenderbackendgl4_p.h b/src/render/backends/gl/qssgrenderbackendgl4_p.h
index 4266fe37..9a492326 100644
--- a/src/render/backends/gl/qssgrenderbackendgl4_p.h
+++ b/src/render/backends/gl/qssgrenderbackendgl4_p.h
@@ -49,6 +49,10 @@
 
 QT_BEGIN_NAMESPACE
 
+#if !defined(QT_OPENGL_ES)
+    class QOpenGLExtension_EXT_direct_state_access;
+#endif
+
 class QSSGRenderBackendGL4Impl : public QSSGRenderBackendGL3Impl
 {
 public:
diff --git a/src/render/backends/gl/qssgrenderbackendglbase_p.h b/src/render/backends/gl/qssgrenderbackendglbase_p.h
index de8c5dc5..4051406e 100644
--- a/src/render/backends/gl/qssgrenderbackendglbase_p.h
+++ b/src/render/backends/gl/qssgrenderbackendglbase_p.h
@@ -54,8 +54,6 @@
 #include <QtGui/QSurfaceFormat>
 #include <QtGui/QOpenGLFunctions>
 
-#include <QtOpenGLExtensions/QtOpenGLExtensions>
-
 QT_BEGIN_NAMESPACE
 
 // Enable this to log opengl errors instead of an assert
diff --git a/src/render/backends/gl/qssgrenderbackendgles2.cpp b/src/render/backends/gl/qssgrenderbackendgles2.cpp
index 659df810..eab78b3f 100644
--- a/src/render/backends/gl/qssgrenderbackendgles2.cpp
+++ b/src/render/backends/gl/qssgrenderbackendgles2.cpp
@@ -32,6 +32,7 @@
 #include <QtQuick3DRender/private/qssgrenderbackendinputassemblergl_p.h>
 #include <QtQuick3DRender/private/qssgrenderbackendrenderstatesgl_p.h>
 #include <QtQuick3DRender/private/qssgrenderbackendshaderprogramgl_p.h>
+#include <QtQuick3DRender/private/qssgopenglextensions_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/backends/gl/qssgrenderbackendgles2_p.h b/src/render/backends/gl/qssgrenderbackendgles2_p.h
index 9961c131..9e012751 100644
--- a/src/render/backends/gl/qssgrenderbackendgles2_p.h
+++ b/src/render/backends/gl/qssgrenderbackendgles2_p.h
@@ -43,15 +43,16 @@
 //
 
 #include <QtQuick3DRender/private/qssgrenderbackendglbase_p.h>
-#include <QtQuick3DRender/private/qssgopenglextensions_p.h>
 
 #include <QtGui/qopenglextrafunctions.h>
-#include <QtOpenGLExtensions/QtOpenGLExtensions>
 
 QT_BEGIN_NAMESPACE
 
 ///< forward declaration
 class QSSGRenderBackendMiscStateGL;
+#if defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2_ANGLE)
+    class QSSGOpenGLES2Extensions;
+#endif
 
 class QSSGRenderBackendGLES2Impl : public QSSGRenderBackendGLBase
 {
diff --git a/src/render/qssgrendershaderprogram.cpp b/src/render/qssgrendershaderprogram.cpp
index a32434f2..bc873290 100644
--- a/src/render/qssgrendershaderprogram.cpp
+++ b/src/render/qssgrendershaderprogram.cpp
@@ -34,6 +34,8 @@
 #include <QtQuick3DRender/private/qssgrenderimagetexture_p.h>
 #include <QtQuick3DUtils/private/qssgutils_p.h>
 
+#include <QtGui/qcolor.h>
+
 #include <limits>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/qssgrendershaderprogram_p.h b/src/render/qssgrendershaderprogram_p.h
index 3c0d1e9b..facd8255 100644
--- a/src/render/qssgrendershaderprogram_p.h
+++ b/src/render/qssgrendershaderprogram_p.h
@@ -59,6 +59,7 @@ class QSSGRenderGeometryShader;
 class QSSGRenderShaderConstantBase;
 class QSSGRenderShaderBufferBase;
 class QSSGRenderComputeShader;
+class QColor;
 
 typedef QHash<QByteArray, QSSGRef<QSSGRenderShaderConstantBase>> TShaderConstantMap;
 typedef QHash<QByteArray, QSSGRef<QSSGRenderShaderBufferBase>> TShaderBufferMap;
diff --git a/src/render/render.pro b/src/render/render.pro
index 083064cd..cacd67cb 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -1,7 +1,9 @@
 TARGET = QtQuick3DRender
 MODULE = quick3drender
 
-QT += quick3dutils-private openglextensions quick
+QT += quick3dutils-private quick
+
+QT_PRIVATE += openglextensions
 
 DEFINES += QT_BUILD_QUICK3DRENDER_LIB
 
diff --git a/src/runtimerender/qssgrendercontextcore_p.h b/src/runtimerender/qssgrendercontextcore_p.h
index f3d1a475..0e71082e 100644
--- a/src/runtimerender/qssgrendercontextcore_p.h
+++ b/src/runtimerender/qssgrendercontextcore_p.h
@@ -58,6 +58,8 @@
 #include <QtCore/QPair>
 #include <QtCore/QSize>
 
+#include <QtGui/qcolor.h>
+
 QT_BEGIN_NAMESPACE
 
 enum class ScaleModes