Move qglxconvenience to QtOpenGL

Task-number: QTBUG-83255
Change-Id: I7640caf8afbae0a7310a264f333bb3a6cfa3c6ed
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

8 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
index 68abfbdea5..8d2a62d2bc 100644
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@@ -31,7 +31,7 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
     PUBLIC_LIBRARIES
-        Qt::GlxSupportPrivate
+        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 52d2b829d8..40783206e0 100644
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@@ -32,7 +32,7 @@ qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_
     SOURCES
         qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
     PUBLIC_LIBRARIES
-        Qt::GlxSupportPrivate
+        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 5683b5e8ce..9364775c27 100644
--- a/src/plugins/platforms/offscreen/offscreen.pro
+++ b/src/plugins/platforms/offscreen/offscreen.pro
@@ -19,7 +19,7 @@ OTHER_FILES += offscreen.json
 qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) {
     SOURCES += qoffscreenintegration_x11.cpp
     HEADERS += qoffscreenintegration_x11.h
-    QT += glx_support-private
+    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 bcf996f708..4b37aac468 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 <QtGlxSupport/private/qglxconvenience_p.h>
+#include <QtOpenGL/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 b8ed160b09..769ac953a6 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@@ -21,9 +21,9 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::GlxSupportPrivate
         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 6318501662..8efd10aa32 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 <QtGlxSupport/private/qglxconvenience_p.h>
+#include <QtOpenGL/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 5e406017ca..2ccaa5b80b 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 <QtGlxSupport/private/qglxconvenience_p.h>
+#include <QtOpenGL/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 9d537b18f3..c8bed1bfb4 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,7 @@
 TARGET = qxcb-glx-integration
 
 include(../gl_integrations_plugin_base.pri)
-QT += glx_support-private
+QT += opengl-private
 
 DEFINES += QT_NO_FOREACH