diff options
Diffstat (limited to 'src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h')
| -rw-r--r-- | src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h index d7d1d491..ba36fac3 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h @@ -58,7 +58,13 @@ #include <X11/Xlib.h> #include <EGL/egl.h> -struct wl_xcomposite; +// avoid clashes with Qt::CursorShape +#ifdef CursorShape +# define X_CursorShape CursorShape +# undef CursorShape +#endif + +struct qt_xcomposite; QT_BEGIN_NAMESPACE |