diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-11-05 09:49:06 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-17 18:19:34 +0000 |
| commit | 8fe41ec5fe48e60020a09993e7f49561548f4d88 (patch) | |
| tree | 891496d9d41470ad6400dc166653e6ac6a3c01ea | |
| parent | 60620fc95f0d2ae14f271cecffc0ccdc172073cc (diff) | |
wayland-egl: fix build with recent eglplatform.h
EGL_NO_X11 has been replaced with USE_X11, thus breaking all existing
code out there, including Qt:
https://github.com/KhronosGroup/EGL-Registry/pull/130
QtGui/private/qt_egl_p.h now defines USE_X11 whenever we do not define
QT_EGL_NO_X11.
See also 4cc5428548cb8ab973e4b0281dd123d59bfaf6a0 in qtbase.
Fixes: QTBUG-99746
Change-Id: If67b9f1f37dac59bb518010fec08944bc181766d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 2dc725c57bb12a99f141b3852f6db516ced1661b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt index 2e81f9025..c88c438d8 100644 --- a/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt +++ b/src/hardwareintegration/compositor/wayland-egl/CMakeLists.txt @@ -19,3 +19,8 @@ qt_internal_add_module(WaylandEglCompositorHwIntegrationPrivate Qt::Gui Qt::WaylandCompositorPrivate ) + +qt_internal_extend_target(WaylandEglCompositorHwIntegrationPrivate CONDITION NOT QT_FEATURE_egl_x11 + DEFINES + QT_EGL_NO_X11 +) |