diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-23 16:56:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-25 14:24:08 +0200 |
commit | 8f765ed71128ecc50aa7cd464be1332658df6e10 (patch) | |
tree | 14b6c80191dbd1a7c5ac9d22d1642e4ae0c5e276 /recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |
parent | 52496ed3e2ec94d1d93426a766ec93ab400bc1df (diff) | |
download | meta-qt5-8f765ed71128ecc50aa7cd464be1332658df6e10.tar.gz |
qt5: upgrade to latest revision in 5.5 branches
* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream
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 fbddae3b..0875bd88 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 0b4d9044218df6e7fb700be6cfd21b4aaab24b18 Mon Sep 17 00:00:00 2001 | 1 | From c3f540be8541f71fdb7b7baa9000583a914ac7f7 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.0 | 29 | 2.5.3 |
30 | 30 | ||