Move glxconvenience into QtGui

OpenGL is not quite as dead as initially assumed.

Task-number: QTBUG-83255
Change-Id: I953040149812a5258caad5fe6bac0835e1982dd0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

19 files changed, 48 insertions, 58 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index a4820965e7..2aa4c20f5b 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -680,6 +680,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
         util/qundogroup.cpp util/qundogroup.h
 )
 
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+    SOURCES
+        opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
+    PUBLIC_LIBRARIES
+        X11::X11
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
     SOURCES
         rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
@@ -693,7 +700,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
-#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### Keys ignored in scope 104:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
 # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
 # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
 # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
@@ -709,10 +716,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 105:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 106:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index a31b13ff58..bca7b4ad7c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -786,6 +786,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
         util/qundogroup.cpp util/qundogroup.h
 )
 
+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+    SOURCES
+        opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
+    PUBLIC_LIBRARIES
+        X11::X11
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
     SOURCES
         rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
@@ -855,10 +862,10 @@ add_custom_command(
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 105:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 106:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
index 85fdb609cd..61f333ec69 100644
--- a/src/gui/opengl/opengl.pri
+++ b/src/gui/opengl/opengl.pri
@@ -15,3 +15,5 @@ qtConfig(opengl) {
                opengl/qopenglfunctions.cpp \
                opengl/qopenglprogrambinarycache.cpp
 }
+
+include(platform/platform.pri)
diff --git a/src/opengl/platform/platform.pri b/src/gui/opengl/platform/platform.pri
index 4255f09a4e..4255f09a4e 100644
--- a/src/opengl/platform/platform.pri
+++ b/src/gui/opengl/platform/platform.pri
diff --git a/src/opengl/platform/unix/qglxconvenience.cpp b/src/gui/opengl/platform/unix/qglxconvenience.cpp
index 94781aac3d..94781aac3d 100644
--- a/src/opengl/platform/unix/qglxconvenience.cpp
+++ b/src/gui/opengl/platform/unix/qglxconvenience.cpp
diff --git a/src/opengl/platform/unix/qglxconvenience_p.h b/src/gui/opengl/platform/unix/qglxconvenience_p.h
index ed7b522f8d..ecd8737f87 100644
--- a/src/opengl/platform/unix/qglxconvenience_p.h
+++ b/src/gui/opengl/platform/unix/qglxconvenience_p.h
@@ -51,7 +51,6 @@
 // We mean it.
 //
 
-#include <QtOpenGL/qtopenglglobal.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qsurfaceformat.h>
 
@@ -65,28 +64,28 @@ enum QGlxFlags
     QGLX_SUPPORTS_SRGB = 0x01
 };
 
-Q_OPENGL_EXPORT QList<int> qglx_buildSpec(const QSurfaceFormat &format,
-                                          int drawableBit = GLX_WINDOW_BIT,
-                                          int flags = 0);
+Q_GUI_EXPORT QList<int> qglx_buildSpec(const QSurfaceFormat &format,
+                                       int drawableBit = GLX_WINDOW_BIT,
+                                       int flags = 0);
 
-Q_OPENGL_EXPORT XVisualInfo *qglx_findVisualInfo(Display *display, int screen,
-                                                 QSurfaceFormat *format,
-                                                 int drawableBit = GLX_WINDOW_BIT,
-                                                 int flags = 0);
+Q_GUI_EXPORT XVisualInfo *qglx_findVisualInfo(Display *display, int screen,
+                                              QSurfaceFormat *format,
+                                              int drawableBit = GLX_WINDOW_BIT,
+                                              int flags = 0);
 
-Q_OPENGL_EXPORT GLXFBConfig qglx_findConfig(Display *display, int screen,
-                                            QSurfaceFormat format,
-                                            bool highestPixelFormat = false,
-                                            int drawableBit = GLX_WINDOW_BIT,
-                                            int flags = 0);
+Q_GUI_EXPORT GLXFBConfig qglx_findConfig(Display *display, int screen,
+                                         QSurfaceFormat format,
+                                         bool highestPixelFormat = false,
+                                         int drawableBit = GLX_WINDOW_BIT,
+                                         int flags = 0);
 
-Q_OPENGL_EXPORT void qglx_surfaceFormatFromGLXFBConfig(QSurfaceFormat *format, Display *display,
-                                                       GLXFBConfig config, int flags = 0);
+Q_GUI_EXPORT void qglx_surfaceFormatFromGLXFBConfig(QSurfaceFormat *format, Display *display,
+                                                    GLXFBConfig config, int flags = 0);
 
-Q_OPENGL_EXPORT void qglx_surfaceFormatFromVisualInfo(QSurfaceFormat *format, Display *display,
-                                                      XVisualInfo *visualInfo, int flags = 0);
+Q_GUI_EXPORT void qglx_surfaceFormatFromVisualInfo(QSurfaceFormat *format, Display *display,
+                                                   XVisualInfo *visualInfo, int flags = 0);
 
-Q_OPENGL_EXPORT bool qglx_reduceFormat(QSurfaceFormat *format);
+Q_GUI_EXPORT bool qglx_reduceFormat(QSurfaceFormat *format);
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/opengl/platform/unix/unix.pri b/src/gui/opengl/platform/unix/unix.pri
new file mode 100644
index 0000000000..7acc589114
--- /dev/null
+++ b/src/gui/opengl/platform/unix/unix.pri
@@ -0,0 +1,7 @@
+HEADERS += \
+   opengl/platform/unix/qglxconvenience_p.h
+
+SOURCES += \
+   opengl/platform/unix/qglxconvenience.cpp
+
+QMAKE_USE += xlib
diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
index a477bf2f6b..1d8544ab8e 100644
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -99,13 +99,6 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
-    SOURCES
-        platform/unix/qglxconvenience.cpp platform/unix/qglxconvenience_p.h
-    PUBLIC_LIBRARIES
-        X11::X11
-)
-
 
 qt_create_tracepoints(OpenGL qtopengl.tracepoints)
 qt_add_docs(OpenGL
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 5fc9adb103..781301dc0f 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -99,13 +99,6 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
-    SOURCES
-        platform/unix/qglxconvenience.cpp platform/unix/qglxconvenience_p.h
-    PUBLIC_LIBRARIES
-        X11::X11
-)
-
 qt_create_tracepoints(OpenGL qtopengl.tracepoints)
 qt_add_docs(OpenGL
     doc/qtopengl.qdocconf
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 97871c3757..0dd3d33552 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -151,8 +151,6 @@ qtConfig(egl) {
         qopenglcompositor_p.h
 }
 
-include(platform/platform.pri)
-
 load(qt_module)
 
 TRACEPOINT_PROVIDER = $$PWD/qtopengl.tracepoints
diff --git a/src/opengl/platform/unix/unix.pri b/src/opengl/platform/unix/unix.pri
deleted file mode 100644
index 1cdf0ca22d..0000000000
--- a/src/opengl/platform/unix/unix.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-QMAKE_USE += xlib
-
-HEADERS += \
-   platform/unix/qglxconvenience_p.h
-
-SOURCES += \
-   platform/unix/qglxconvenience.cpp
-
-QMAKE_USE += xlib
diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
index 8d2a62d2bc..c69719dda7 100644
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -30,8 +30,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
-    PUBLIC_LIBRARIES
-        Qt::OpenGLPrivate
 )
 
 #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt
index 40783206e0..ee738851e5 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -31,8 +31,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
-    PUBLIC_LIBRARIES
-        Qt::OpenGLPrivate
 )
 
 #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
index 9364775c27..8b11e5ca74 100644
--- a/src/plugins/platforms/offscreen/offscreen.pro
+++ b/src/plugins/platforms/offscreen/offscreen.pro
@@ -19,7 +19,6 @@ OTHER_FILES += offscreen.json
 qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) {
     SOURCES += qoffscreenintegration_x11.cpp
     HEADERS += qoffscreenintegration_x11.h
-    QT += opengl-private
 }
 
 PLUGIN_TYPE = platforms
diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
index 4b37aac468..c866a55dc0 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
@@ -45,7 +45,7 @@
 #include <X11/Xlib.h>
 #include <GL/glx.h>
 
-#include <QtOpenGL/private/qglxconvenience_p.h>
+#include <QtGui/private/qglxconvenience_p.h>
 
 #include <qpa/qplatformsurface.h>
 #include <qsurface.h>
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
index 769ac953a6..94d9b60310 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -23,7 +23,6 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::OpenGLPrivate
         Qt::XcbQpaPrivate
 )
 
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index 8efd10aa32..4c1786394f 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -55,7 +55,7 @@
 #include <QtGui/QOffscreenSurface>
 
 #include "qglxintegration.h"
-#include <QtOpenGL/private/qglxconvenience_p.h>
+#include <QtGui/private/qglxconvenience_p.h>
 
 #include "qxcbglintegration.h"
 
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp
index 2ccaa5b80b..c021388c5b 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp
@@ -40,7 +40,7 @@
 #include "qxcbglxwindow.h"
 
 #include "qxcbscreen.h"
-#include <QtOpenGL/private/qglxconvenience_p.h>
+#include <QtGui/private/qglxconvenience_p.h>
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
index c8bed1bfb4..0ba7926f9a 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
@@ -1,7 +1,6 @@
 TARGET = qxcb-glx-integration
 
 include(../gl_integrations_plugin_base.pri)
-QT += opengl-private
 
 DEFINES += QT_NO_FOREACH