diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2019-12-02 20:01:30 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2019-12-04 01:48:32 -0800 |
| commit | d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0 (patch) | |
| tree | 6066bea19aa9e53fc47751a34c764528ee72a967 | |
| parent | e86d96e321caa623ac0f98f44323c2b204cd9861 (diff) | |
Fix build: don't let X11/Xlib.h's None interferev5.14.0-rc2v5.14.0
Mesa's EGL headers #include <X11/Xlib.h>
In file included from /usr/include/X11/Xlib.h:44,
from /usr/include/EGL/eglplatform.h:130,
from /usr/include/EGL/egl.h:39,
from qsgvideonode_egl.h:48,
from .moc/moc_qsgvideonode_egl.cpp:10:
qurl.h:135:9: error: expected identifier before numeric constant
135 | None = 0x0,
| ^~~~
Similar to e16ac8b55c36586aa67b1d4ec5e1b4edf03cd06b (5.4).
Change-Id: Ic96c456e54524e25b03ffffd15dcc08f16385cbb
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| -rw-r--r-- | src/plugins/videonode/egl/qsgvideonode_egl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/videonode/egl/qsgvideonode_egl.h b/src/plugins/videonode/egl/qsgvideonode_egl.h index 0ec63eac1..f83231e53 100644 --- a/src/plugins/videonode/egl/qsgvideonode_egl.h +++ b/src/plugins/videonode/egl/qsgvideonode_egl.h @@ -51,6 +51,9 @@ #ifdef Bool # undef Bool #endif +#ifdef None +# undef None +#endif QT_BEGIN_NAMESPACE |