diff options
Diffstat (limited to 'src/plugins/platforms/eglfs')
16 files changed, 18 insertions, 20 deletions
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index b774fb63f7..871f1b4065 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -22,7 +22,6 @@ qt_add_module(EglFSDeviceIntegration PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate - Qt::EglSupportPrivate Qt::FbSupportPrivate Qt::GuiPrivate Qt::PlatformHeadersPrivate diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 5473e9683f..d6de0cd6a1 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -23,7 +23,6 @@ qt_add_module(EglFSDeviceIntegration PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate - Qt::EglSupportPrivate Qt::FbSupportPrivate Qt::GuiPrivate Qt::PlatformHeadersPrivate diff --git a/src/plugins/platforms/eglfs/api/qeglfscontext.cpp b/src/plugins/platforms/eglfs/api/qeglfscontext.cpp index 2dbf762cf4..5e5c0218da 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscontext.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfscontext.cpp @@ -39,8 +39,8 @@ #include "qeglfsglobal_p.h" #include <QtGui/QSurface> -#include <QtEglSupport/private/qeglconvenience_p.h> -#include <QtEglSupport/private/qeglpbuffer_p.h> +#include <QtGui/private/qeglconvenience_p.h> +#include <QtGui/private/qeglpbuffer_p.h> #include "qeglfscontext_p.h" #include "qeglfswindow_p.h" diff --git a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h index f3b506ac7f..2cea72fb03 100644 --- a/src/plugins/platforms/eglfs/api/qeglfscontext_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfscontext_p.h @@ -53,7 +53,7 @@ #include "qeglfsglobal_p.h" #include "qeglfscursor_p.h" -#include <QtEglSupport/private/qeglplatformcontext_p.h> +#include <QtGui/private/qeglplatformcontext_p.h> #include <QtCore/QVariant> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp index b985386a4e..4b5a3c8c70 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp @@ -46,7 +46,7 @@ #include "qeglfsscreen_p.h" #include "qeglfshooks_p.h" -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> #include <QGuiApplication> #include <private/qguiapplication_p.h> #include <QScreen> diff --git a/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h b/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h index 8d76ff5ee0..88415f911e 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfsglobal_p.h @@ -53,7 +53,7 @@ #include <QtCore/qglobal.h> -#include <QtEglSupport/private/qt_egl_p.h> +#include <QtGui/private/qt_egl_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index 62b9c8a7c2..3ce78623fa 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -61,10 +61,10 @@ #endif #include "qeglfsoffscreenwindow_p.h" -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> #ifndef QT_NO_OPENGL -# include <QtEglSupport/private/qeglplatformcontext_p.h> -# include <QtEglSupport/private/qeglpbuffer_p.h> +# include <QtGui/private/qeglplatformcontext_p.h> +# include <QtGui/private/qeglpbuffer_p.h> #endif #include <QtGui/private/qgenericunixfontdatabase_p.h> diff --git a/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow.cpp b/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow.cpp index c96e329816..1a74ac473b 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsoffscreenwindow.cpp @@ -40,7 +40,7 @@ #include "qeglfsoffscreenwindow_p.h" #include "qeglfshooks_p.h" #include <QtGui/QOffscreenSurface> -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp index e3b49f79dd..452dba10c7 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp @@ -47,7 +47,7 @@ # include <QtGui/QOpenGLContext> # include <QtOpenGL/private/qopenglcompositorbackingstore_p.h> #endif -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> #include "qeglfswindow_p.h" #ifndef QT_NO_OPENGL diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp index cb7844aff0..bb840a2e06 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp @@ -42,8 +42,8 @@ #include "private/qeglfsintegration_p.h" #include <private/qguiapplication_p.h> -#include <QtEglSupport/private/qeglconvenience_p.h> -#include <QtEglSupport/private/qeglplatformcontext_p.h> +#include <QtGui/private/qeglconvenience_p.h> +#include <QtGui/private/qeglplatformcontext_p.h> #include <qpa/qwindowsysteminterface.h> diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.cpp index a93762e5b4..b5f34ae200 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmwindow.cpp @@ -41,7 +41,7 @@ #include "qeglfskmsgbmintegration.h" #include "qeglfskmsgbmscreen.h" -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp index a480a390d1..794fb4db05 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp @@ -41,7 +41,7 @@ #include "qeglfskmsegldeviceintegration.h" #include "qeglfskmsegldevice.h" #include "qeglfskmsegldevicescreen.h" -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> #include "private/qeglfswindow_p.h" #include "private/qeglfscursor_p.h" #include <QLoggingCategory> diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h index 5819d82ebf..8fbbe56412 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.h @@ -46,7 +46,7 @@ #include <xf86drm.h> #include <xf86drmMode.h> -#include <QtEglSupport/private/qeglstreamconvenience_p.h> +#include <QtGui/private/qeglstreamconvenience_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp index 6aeb826fa5..7e8462eb4c 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp @@ -45,7 +45,7 @@ #include "private/qeglfswindow_p.h" #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h> -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> #include <QtCore/QLoggingCategory> #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp index 212ebde05a..9f8dbe4809 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_rcar/qeglfsrcarintegration.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include <QDebug> -#include <QtEglSupport/private/qeglconvenience_p.h> +#include <QtGui/private/qeglconvenience_p.h> #include <EGL/egl.h> #include "INTEGRITY.h" #include "qeglfsrcarintegration.h" diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index 85e0d48bc0..2b611f8e69 100644 --- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro +++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro @@ -12,7 +12,7 @@ QT += \ core-private gui-private \ platformheaders-private \ devicediscovery_support-private \ - fb_support-private egl_support-private + fb_support-private qtHaveModule(input_support-private): \ QT += input_support-private |