diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-27 13:48:38 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-09 11:06:30 +0100 |
commit | 54c44443c34f077bfc2c5cc3a92d6db59d28343c (patch) | |
tree | 479cd0ba85d55e8d01ae1396bca7397880360b70 /recipes-qt/qt5/qtwayland-git | |
parent | 5b8f470597d4f163952f3b63a8ee39a2ccabfe4c (diff) | |
download | meta-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/qtwayland-git')
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch index 16433d55..ae3d998f 100644 --- a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3cf60039ff1825c58bee5c79c66e7d12f4039fc7 Mon Sep 17 00:00:00 2001 | 1 | From 99c49a3304c1d08d164e0df252ca85f426381bb7 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <morphis@gravedo.de> | 2 | From: Simon Busch <morphis@gravedo.de> |
3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 | 3 | Date: Fri, 19 Jul 2013 13:35:14 +0000 |
4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side | 4 | Subject: [PATCH] Install the qtwaylandscanner tool to the native side |
@@ -28,5 +28,5 @@ index ac2d07b..7a46a24 100644 | |||
28 | +target.path = $$[QT_HOST_BINS] | 28 | +target.path = $$[QT_HOST_BINS] |
29 | +INSTALLS += target | 29 | +INSTALLS += target |
30 | -- | 30 | -- |
31 | 2.1.1 | 31 | 2.1.3 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch index 1af124a6..664fa3f9 100644 --- a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch +++ b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9c98c0c411ecaf4cb95b76d0c07e72af75a8d7f0 Mon Sep 17 00:00:00 2001 | 1 | From cd1e17e8c6082fe8578d64baaff55f1f00c0f7a0 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: Sat, 22 Feb 2014 17:47:44 +0100 | 3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 |
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | 4 | Subject: [PATCH] examples/wayland: include server-buffer only when building |
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644 | |||
27 | + } | 27 | + } |
28 | } | 28 | } |
29 | -- | 29 | -- |
30 | 2.1.1 | 30 | 2.1.3 |
31 | 31 | ||