From f42186815187be1a0c5c0f9d6acc657872d3d533 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 20 Sep 2021 11:16:09 +0200 Subject: [PATCH] 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 (cherry picked from commit 4cc5428548cb8ab973e4b0281dd123d59bfaf6a0) --- src/gui/configure.json | 3 ++- src/platformsupport/eglconvenience/qt_egl_p.h | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json index 1f08795c57..12c95742d2 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -834,7 +834,8 @@ "// embedded devices, are not intended to be used together with X. EGL support", "// has to be disabled in plugins like xcb in this case since the native display,", "// window and pixmap types will be different than what an X-based platform", - "// plugin would expect." + "// plugin would expect.", + "#define USE_X11" ], "include": [ "EGL/egl.h", "X11/Xlib.h" ], "main": [ diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h index bf37d07fd8..dbd42fb799 100644 --- a/src/platformsupport/eglconvenience/qt_egl_p.h +++ b/src/platformsupport/eglconvenience/qt_egl_p.h @@ -61,7 +61,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 -- GitLab