summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-04-16 13:14:57 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-04-29 00:07:14 +0200
commit04240161ef8ec0f584c68485abc02778786c5e75 (patch)
treed02eae04e6774cbad54a3fc13e55a373a57bc549 /recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch
parent932b32c1c9e9a3ac833c82ff9273683345056ec7 (diff)
downloadmeta-qt5-04240161ef8ec0f584c68485abc02778786c5e75.tar.gz
git-recipes: upgrade to latest revision in 5.4 branch
* this gets us close to 5.4.2 for people who want to test it in advance * I plan to apply this to fido branch (as well as final upgrade to 5.4.2 recipes * I'm preparing similar patch for 5.5 revisions, which will be applied only in master branch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index 251cdc6e..04fb3709 100644
--- a/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase-git/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,4 +1,4 @@
1From b4d4c91bb504c9e90b69a2d78453bf3523ec6822 Mon Sep 17 00:00:00 2001 1From 6061c8457ea1f76745bd9918e61bda01ef96ce56 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 19 Mar 2014 18:32:28 +0100 3Date: Wed, 19 Mar 2014 18:32:28 +0100
4Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h 4Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h
@@ -26,5 +26,5 @@ index 2b5d5f5..a0aab03 100644
26 26
27 class QEGLPlatformScreen; 27 class QEGLPlatformScreen;
28-- 28--
292.3.1 292.3.5
30 30