diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-09-20 11:16:09 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-09-21 16:21:01 +0200 |
| commit | 4cc5428548cb8ab973e4b0281dd123d59bfaf6a0 (patch) | |
| tree | 3b2b7721e8f55269be3f6a0c1006f86d0cd5cb3e /src/gui/opengl | |
| parent | 68ad67b6faf6922c66ddafee0dc055666a73cddd (diff) | |
Cater for upstream changes in 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
Fix this by defining USE_X11 whenever we do not define EGL_NO_X11.
Fixes: QTBUG-96392
Pick-to: 6.2
Change-Id: If8b68caa8c9022477d87169ca2e2a0121a9313e0
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/platform/egl/qt_egl_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/opengl/platform/egl/qt_egl_p.h b/src/gui/opengl/platform/egl/qt_egl_p.h index c33cc8aa21..5d4e2fd6d4 100644 --- a/src/gui/opengl/platform/egl/qt_egl_p.h +++ b/src/gui/opengl/platform/egl/qt_egl_p.h @@ -65,7 +65,11 @@ # if !defined(Q_OS_INTEGRITY) # define WIN_INTERFACE_CUSTOM // NV # endif // Q_OS_INTEGRITY -#endif // QT_EGL_NO_X11 +#else // QT_EGL_NO_X11 +// If one has an eglplatform.h with https://github.com/KhronosGroup/EGL-Registry/pull/130 +// that needs USE_X11 to be defined. +# define USE_X11 +#endif #ifdef QT_EGL_WAYLAND # define WAYLAND // NV |