diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch new file mode 100644 index 00000000..24ae7ea4 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From 0923f72a444bcdc0675a24aec9782692b41d301c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 | ||
| 4 | Subject: [PATCH 07/10] qeglplatformintegration: Undefine CursorShape from X.h | ||
| 5 | |||
| 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 7 | --- | ||
| 8 | src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++ | ||
| 9 | 1 file changed, 6 insertions(+) | ||
| 10 | |||
| 11 | diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
| 12 | index f665455..9eb783c 100644 | ||
| 13 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
| 14 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
| 15 | @@ -46,6 +46,12 @@ | ||
| 16 | #include <qpa/qplatformnativeinterface.h> | ||
| 17 | #include <EGL/egl.h> | ||
| 18 | |||
| 19 | +// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ | ||
| 20 | +// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */ | ||
| 21 | +#ifdef CursorShape | ||
| 22 | +#undef CursorShape | ||
| 23 | +#endif | ||
| 24 | + | ||
| 25 | QT_BEGIN_NAMESPACE | ||
| 26 | |||
| 27 | class QEGLPlatformScreen; | ||
| 28 | -- | ||
| 29 | 1.9.1 | ||
| 30 | |||
