Skip to content

Cater for upstream changes in eglplatform.h

Antonio Rojas requested to merge arojas/qtbase:qtbug-96392 into kde/5.15

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 (cherry picked from commit 4cc54285)

Merge request reports