diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-08 15:48:46 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-13 22:07:46 +0200 |
commit | ee0198a0183ec2b0cd9ddc6663110cd8e40320aa (patch) | |
tree | 74cb7cc1bbd982200480f66dc1057f71f837675b /src/plugins/platforms/directfb | |
parent | 70f7155fcc20e43f096a029889d8a8117e11f70d (diff) |
Move eglconvenience to QtGui
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>
Diffstat (limited to 'src/plugins/platforms/directfb')
-rw-r--r-- | src/plugins/platforms/directfb/.prev_CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/platforms/directfb/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/plugins/platforms/directfb/directfb.pro | 1 | ||||
-rw-r--r-- | src/plugins/platforms/directfb/qdirectfb_egl.cpp | 6 |
4 files changed, 5 insertions, 8 deletions
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 |