1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to QtPlatformCompositorSupport removal

Browse Source 
Change-Id: Ic85f91d64c625a7196694cb49ff19df0661d5cbc
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-05-26 15:01:05 +02:00 committed by Liang Qi
parent e4512b858c
commit c587035d51
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/CMakeLists.txt
View File

@ -99,9 +99,9 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
) )
qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate qt_extend_target(WaylandClient CONDITION QT_FEATURE_opengl
LIBRARIES LIBRARIES
Qt::PlatformCompositorSupportPrivate Qt::OpenGLPrivate
) )
qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate

3
src/plugins/platforms/wayland/client.pro
View File

@ -19,8 +19,7 @@ qtConfig(xkbcommon) {
QT_FOR_PRIVATE += xkbcommon_support-private QT_FOR_PRIVATE += xkbcommon_support-private
} }
qtHaveModule(platformcompositor_support-private): \ qtConfig(opengl): QT += opengl-private
QT_PRIVATE += platformcompositor_support-private
qtHaveModule(linuxaccessibility_support-private): \ qtHaveModule(linuxaccessibility_support-private): \
QT_PRIVATE += linuxaccessibility_support-private QT_PRIVATE += linuxaccessibility_support-private

2
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -68,7 +68,7 @@
#include <QtGui/QSurfaceFormat> #include <QtGui/QSurfaceFormat>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> #include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
#endif // QT_CONFIG(opengl) #endif // QT_CONFIG(opengl)
#include <QSocketNotifier> #include <QSocketNotifier>