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/minimalegl | |
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/minimalegl')
5 files changed, 6 insertions, 7 deletions
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 |