From 6758f73bb7f85898b2f2a24149bdacf898601e25 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 9 Jul 2020 15:48:19 +0200
Subject: Move glxconvenience into QtGui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/platforms/offscreen/.prev_CMakeLists.txt          | 2 --
 src/plugins/platforms/offscreen/CMakeLists.txt                | 2 --
 src/plugins/platforms/offscreen/offscreen.pro                 | 1 -
 src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp | 2 +-
 4 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/plugins/platforms/offscreen')

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>
-- 
cgit v1.2.3