summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-11-27 13:48:38 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-12-09 11:06:30 +0100
commit54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch)
tree479cd0ba85d55e8d01ae1396bca7397880360b70 /recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
parent5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff)
downloadmeta-qt5-54c44443c34f077bfc2c5cc3a92d6db59d28343c.tar.gz
qt5-git: Update to rc1+, latest revision in 5.4 branch
* qtwebengine LIC_FILES_CHKSUM updated because of Copyright year update in chromium's LICENSE < // Copyright (c) 2013 The Chromium Authors. All rights reserved. and shortened the entry for qtwebengine LIC_FILES_CHKSUM, because it was including also few #include lines which were changed recently Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index ddc541a7..c528f0c9 100644
--- a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,4 +1,4 @@
1From 2ec9a882cd9a0893f2060ef36d28e0568416f9fe Mon Sep 17 00:00:00 2001 1From 8e152449beb18454347cfdb300c50d113fa48383 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 07/11] qeglplatformintegration: Undefine CursorShape from X.h 4Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h
@@ -26,5 +26,5 @@ index 4d7adce..c9b6873 100644
26 26
27 class QEGLPlatformScreen; 27 class QEGLPlatformScreen;
28-- 28--
292.1.1 292.1.3
30 30