diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-11-05 09:49:06 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-01-17 13:32:45 +0000 |
| commit | 2dc725c57bb12a99f141b3852f6db516ced1661b (patch) | |
| tree | d49e7605892f4a1d482d17c2b44ec7cca0280679 /src/hardwareintegration/compositor/wayland-egl | |
| parent | 33f254d4759b3c6de15650a67db856603dd6267c (diff) | |
| download | qtwayland-2dc725c57bb12a99f141b3852f6db516ced1661b.tar.gz | |
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
Pick-to: 6.3 6.2
Change-Id: If67b9f1f37dac59bb518010fec08944bc181766d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/hardwareintegration/compositor/wayland-egl')
| -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 2e81f902..c88c438d 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 +) |