From 64349c3fd5d6c2acabd1cfd5119a7060b017fdc0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 2 May 2020 17:36:49 -0700 Subject: [PATCH] Fix Mesa warning that MESA_EGL_NO_X11_HEADERS is deprecated The warning isn't printed when EGL_NO_X11 (the new macro) is defined. Fixes: QTBUG-80042 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b5d99f94c8c9b Reviewed-by: Laszlo Agocs --- src/platformsupport/eglconvenience/qt_egl_p.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h index ea554927de..bf37d07fd8 100644 --- a/src/platformsupport/eglconvenience/qt_egl_p.h +++ b/src/platformsupport/eglconvenience/qt_egl_p.h @@ -52,6 +52,9 @@ // #ifdef QT_EGL_NO_X11 +# ifndef EGL_NO_X11 +# define EGL_NO_X11 +# endif # ifndef MESA_EGL_NO_X11_HEADERS # define MESA_EGL_NO_X11_HEADERS // MESA # endif