diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 18:37:41 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-02 15:16:18 +0200 |
| commit | bf2cafa909a27250f853a823e9d7101307337e7a (patch) | |
| tree | 3b70ffa8f12510fb777a42ce7d6eedf4886819d3 /recipes-qt/qt5/qtwayland | |
| parent | c1b0c9f546289b1592d7a895640de103723a0305 (diff) | |
qt5: upgrade to latest revisions in 5.7 branches
* these revisions are after v5.7.0-beta1 tags where available
* it's highly recommended to read:
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
to find out how you're affected check which files/tools are
included in your builds, e.g. for qtwebengine:
OE @ ~/projects/qt-project/qtwebengine $ git grep QT_BEGIN_LICENSE | sed 's/^[^:]*://g' | sort | uniq -c
11 ## $QT_BEGIN_LICENSE:GPL-EXCEPT$
67 ** $QT_BEGIN_LICENSE:BSD$
17 ** $QT_BEGIN_LICENSE:FDL$
61 ** $QT_BEGIN_LICENSE:GPL-EXCEPT$
261 ** $QT_BEGIN_LICENSE:LGPL$
* change in chromium's LICENSE is only copyright year update
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
2 files changed, 10 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch index 45493cf5..c199f712 100644 --- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch @@ -1,4 +1,4 @@ -From cadcacf58301251629a63ecd2682d58e6bf24cb8 Mon Sep 17 00:00:00 2001 +From 4334643f02fc333fa8b633ff614fa4ceecf4a8e6 Mon Sep 17 00:00:00 2001 From: Simon Busch <morphis@gravedo.de> Date: Fri, 19 Jul 2013 13:35:14 +0000 Subject: [PATCH] Install the qtwaylandscanner tool to the native side diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch index f39707c6..72f29534 100644 --- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch @@ -1,4 +1,4 @@ -From 52971db84e3b2c429e8777953c0532dcb88b8e6b Mon Sep 17 00:00:00 2001 +From 3c5c13f2f991cc79363969fb3873d553dd985e7b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 22 Feb 2014 17:47:44 +0100 Subject: [PATCH] examples/wayland: include server-buffer only when building @@ -14,15 +14,14 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro -index d633fb9..643c7cd 100644 +index b67d12e..c5daad0 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro -@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { - SUBDIRS += qml-compositor - } - -- SUBDIRS += server-buffer -+ contains(QT_CONFIG, opengles2) { -+ SUBDIRS += server-buffer -+ } +@@ -9,4 +9,6 @@ qtHaveModule(quick) { + SUBDIRS += custom-extension } + +-SUBDIRS += server-buffer ++contains(QT_CONFIG, opengles2) { ++ SUBDIRS += server-buffer ++} |