diff options
author | Jonathan Liu <net147@gmail.com> | 2014-12-11 15:52:18 +1100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 13:24:22 +0100 |
commit | 6566f728ab3d14a4908516fb13ad555dbfe04471 (patch) | |
tree | d73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |
parent | c9a1041cb956d94c04cbf635b00ca19725ffc129 (diff) | |
download | meta-qt5-6566f728ab3d14a4908516fb13ad555dbfe04471.tar.gz |
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch index c1ffb914..c528f0c9 100644 --- a/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7c16b57ecdddffb4bb52d32bb763791fd8aa8414 Mon Sep 17 00:00:00 2001 | 1 | From 8e152449beb18454347cfdb300c50d113fa48383 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 | 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 |
4 | Subject: [PATCH 07/13] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h |
5 | 5 | ||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
7 | --- | 7 | --- |
@@ -9,11 +9,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
9 | 1 file changed, 6 insertions(+) | 9 | 1 file changed, 6 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 11 | diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h |
12 | index f665455..9eb783c 100644 | 12 | index 4d7adce..c9b6873 100644 |
13 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 13 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h |
14 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 14 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h |
15 | @@ -46,6 +46,12 @@ | 15 | @@ -50,6 +50,12 @@ |
16 | #include <qpa/qplatformnativeinterface.h> | 16 | #include <QtCore/QVariant> |
17 | #include <EGL/egl.h> | 17 | #include <EGL/egl.h> |
18 | 18 | ||
19 | +// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ | 19 | +// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/ |
@@ -26,5 +26,5 @@ index f665455..9eb783c 100644 | |||
26 | 26 | ||
27 | class QEGLPlatformScreen; | 27 | class QEGLPlatformScreen; |
28 | -- | 28 | -- |
29 | 2.1.1 | 29 | 2.1.3 |
30 | 30 | ||