diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-29 22:14:16 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-31 19:46:31 +0200 |
commit | e16ac8b55c36586aa67b1d4ec5e1b4edf03cd06b (patch) | |
tree | 277f58f1073c9f279bf12744a465b0f3c393416a /src | |
parent | 35df77c88ca01975190fa79449343a53a86f8070 (diff) | |
download | qtmultimedia-e16ac8b55c36586aa67b1d4ec5e1b4edf03cd06b.tar.gz |
Fix build with Mesa EGL
Mesa EGL headers include X11 headers, which may #define Bool.
Change-Id: I17379c24bfb7bac809b92f4c2a41298de00a972c
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/videonode/egl/qsgvideonode_egl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/videonode/egl/qsgvideonode_egl.h b/src/plugins/videonode/egl/qsgvideonode_egl.h index 23294a123..a24b678d8 100644 --- a/src/plugins/videonode/egl/qsgvideonode_egl.h +++ b/src/plugins/videonode/egl/qsgvideonode_egl.h @@ -50,6 +50,10 @@ #include <EGL/egl.h> #include <EGL/eglext.h> +#ifdef Bool +# undef Bool +#endif + QT_BEGIN_NAMESPACE class QSGVideoMaterial_EGL : public QSGMaterial |