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

wayland: fix EGL build without x11

Browse Source 
Amend 7c0a96785fee4fea8ef1452166b1dde88957445c and add needed
defines to fix EGL build without x11. Otherwise eglplatform.h
will try to include X11 headers.
See 4cc5428548cb8ab973e4b0281dd123d59bfaf6a0 for more details.

Pick-to: 6.10
Change-Id: I2c284219e83fecf862520a2f667d561adf4d4357
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Samuli Piippo 2025-06-10 09:30:41 +00:00
parent ccb854799d
commit 0f6c93c453
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,11 @@ qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop
qwaylanddnd.cpp qwaylanddnd_p.h
)
qt_internal_extend_target(WaylandClient CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11
DEFINES
QT_EGL_NO_X11
)
qt_internal_add_docs(WaylandClient
doc/qtwaylandclient.qdocconf
)

6
src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt
View File

@ -29,5 +29,11 @@ qt_internal_add_plugin(QWaylandEglClientBufferPlugin
QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3
)
qt_internal_extend_target(QWaylandEglClientBufferPlugin CONDITION QT_FEATURE_egl AND NOT QT_FEATURE_egl_x11
DEFINES
QT_EGL_NO_X11
)
#### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>:
# OTHER_FILES = "wayland-egl.json"