diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-19 14:50:16 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-10-23 13:08:53 +0200 |
| commit | 89038bffd224a0d43aa8627472374503b3023f61 (patch) | |
| tree | f618d1b35f469cb667619274989748b0d5e2c0c1 /recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |
| parent | 37693b5357e790665bce4957cb7a8d5d2423390d (diff) | |
| download | meta-qt5-jansa/jethro.tar.gz | |
qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethro
* this is probably last upgrade for jethro branch, master will switch
to 5.6 soon
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 0875bd88..64f29a58 100644 --- a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From c3f540be8541f71fdb7b7baa9000583a914ac7f7 Mon Sep 17 00:00:00 2001 | 1 | From 168690a50a5d8bb1068d254532710cec8c93a08f 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 05/10] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h |
| @@ -26,5 +26,5 @@ index 42fbf8c..8950f2d 100644 | |||
| 26 | 26 | ||
| 27 | class QEGLPlatformWindow; | 27 | class QEGLPlatformWindow; |
| 28 | -- | 28 | -- |
| 29 | 2.5.3 | 29 | 2.6.1 |
| 30 | 30 | ||