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/directfb/.prev_CMakeLists.txt | 2 --
 src/plugins/platforms/directfb/CMakeLists.txt       | 4 ++--
 src/plugins/platforms/directfb/directfb.pro         | 1 -
 src/plugins/platforms/directfb/qdirectfb_egl.cpp    | 6 +++---
 4 files changed, 5 insertions(+), 8 deletions(-)

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

diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
index 15e43244f0..c6957d57ec 100644
--- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
@@ -37,8 +37,6 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___dir
         qdirectfb_egl.cpp qdirectfb_egl.h
     DEFINES
         DIRECTFB_GL_EGL
-    PUBLIC_LIBRARIES
-        Qt::EglSupportPrivate
 )
 
 qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt
index be6e08bd8e..5e4a2f2baa 100644
--- a/src/plugins/platforms/directfb/CMakeLists.txt
+++ b/src/plugins/platforms/directfb/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 # begin special case:
 qt_find_package(DirectFB)
+qt_find_package(EGL)
 # end special case:
 
 #####################################################################
@@ -24,6 +25,7 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
         qdirectfbwindow.cpp qdirectfbwindow.h
     PUBLIC_LIBRARIES
         PkgConfig::DirectFB
+        EGL::EGL # special case
         Qt::Core
         Qt::CorePrivate
         Qt::Gui
@@ -41,8 +43,6 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___dir
         qdirectfb_egl.cpp qdirectfb_egl.h
     DEFINES
         DIRECTFB_GL_EGL
-    PUBLIC_LIBRARIES
-        Qt::EglSupportPrivate
 )
 
 qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index d63d2469ff..df4bbc9e9e 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -26,7 +26,6 @@ HEADERS = qdirectfbintegration.h \
 
 # ### port the GL context
 contains(QT_CONFIG, directfb_egl) {
-    QT += egl_support-private
     HEADERS += qdirectfb_egl.h
     SOURCES += qdirectfb_egl.cpp
     DEFINES += DIRECTFB_GL_EGL
diff --git a/src/plugins/platforms/directfb/qdirectfb_egl.cpp b/src/plugins/platforms/directfb/qdirectfb_egl.cpp
index d3c95f0b65..95e6093fab 100644
--- a/src/plugins/platforms/directfb/qdirectfb_egl.cpp
+++ b/src/plugins/platforms/directfb/qdirectfb_egl.cpp
@@ -47,10 +47,10 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QScreen>
 
-#include <QtEglSupport/private/qeglplatformcontext_p.h>
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglplatformcontext_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 
-#include <QtEglSupport/private/qt_egl_p.h>
+#include <QtGui/private/qt_egl_p.h>
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3