diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 11:12:46 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 18:28:08 +0100 |
commit | 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (patch) | |
tree | 8df0894830a43956bbf1c629dc3938f3f41ca10a /recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |
parent | fa521467249da68e89c762a178550c8109bccae3 (diff) | |
download | meta-qt5-4d4a34c5d29ef7b730eb9da87b39f91352ef66fa.tar.gz |
recipes: Refresh patches to match git recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch new file mode 100644 index 00000000..84e5dbac --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From f2092e73beaffe163a5c7f66f73956477f0d97a1 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 06/13] 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 4d7adce..c9b6873 100644 | ||
13 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
14 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | ||
15 | @@ -50,6 +50,12 @@ | ||
16 | #include <QtCore/QVariant> | ||
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 | 2.3.1 | ||
30 | |||