From ee0198a0183ec2b0cd9ddc6663110cd8e40320aa Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 8 Jul 2020 15:48:46 +0200
Subject: Move eglconvenience to QtGui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-83255
Change-Id: I8a008d8906308dd73a0793db5b88d3a1b6fdaf5c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/minimalegl/.prev_CMakeLists.txt  | 1 -
 src/plugins/platforms/minimalegl/CMakeLists.txt        | 3 ++-
 src/plugins/platforms/minimalegl/minimalegl.pro        | 3 +--
 src/plugins/platforms/minimalegl/qminimaleglscreen.cpp | 4 ++--
 src/plugins/platforms/minimalegl/qminimaleglscreen.h   | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

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

diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
index 2b60f9550c..15ce608f04 100644
--- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
@@ -17,7 +17,6 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EglSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
index c6edc29042..beb4d54257 100644
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Generated from minimalegl.pro.
+qt_find_package(EGL) # special case
 
 #####################################################################
 ## QMinimalEglIntegrationPlugin Plugin:
@@ -18,9 +19,9 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::CorePrivate
-        Qt::EglSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
+        EGL::EGL # special case
 )
 
 #### Keys ignored in scope 1:.:.:minimalegl.pro:<TRUE>:
diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro
index b846e58d7c..3d21a6546b 100644
--- a/src/plugins/platforms/minimalegl/minimalegl.pro
+++ b/src/plugins/platforms/minimalegl/minimalegl.pro
@@ -1,8 +1,7 @@
 TARGET = qminimalegl
 
 QT += \
-    core-private gui-private \
-    egl_support-private
+    core-private gui-private
 
 #DEFINES += QEGL_EXTRA_DEBUG
 
diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp
index 6e122e28ce..f4cd064f1a 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp
+++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp
@@ -40,9 +40,9 @@
 #include "qminimaleglscreen.h"
 #include "qminimaleglwindow.h"
 
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 #ifndef QT_NO_OPENGL
-# include <QtEglSupport/private/qeglplatformcontext_p.h>
+# include <QtGui/private/qeglplatformcontext_p.h>
 #endif
 
 #ifdef Q_OPENKODE
diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.h b/src/plugins/platforms/minimalegl/qminimaleglscreen.h
index 926936ae32..91b6d366c9 100644
--- a/src/plugins/platforms/minimalegl/qminimaleglscreen.h
+++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QTextStream>
 
-#include <QtEglSupport/private/qt_egl_p.h>
+#include <QtGui/private/qt_egl_p.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3