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/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |
parent | c1b0c9f546289b1592d7a895640de103723a0305 (diff) | |
download | meta-qt5-bf2cafa909a27250f853a823e9d7101307337e7a.tar.gz |
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/0001-examples-wayland-include-server-buffer-only-when-bui.patch')
-rw-r--r-- | recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | 19 |
1 files changed, 9 insertions, 10 deletions
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 @@ | |||
1 | From 52971db84e3b2c429e8777953c0532dcb88b8e6b Mon Sep 17 00:00:00 2001 | 1 | From 3c5c13f2f991cc79363969fb3873d553dd985e7b 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 |
@@ -14,15 +14,14 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | 14 | 1 file changed, 3 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro | 16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro |
17 | index d633fb9..643c7cd 100644 | 17 | index b67d12e..c5daad0 100644 |
18 | --- a/examples/wayland/wayland.pro | 18 | --- a/examples/wayland/wayland.pro |
19 | +++ b/examples/wayland/wayland.pro | 19 | +++ b/examples/wayland/wayland.pro |
20 | @@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { | 20 | @@ -9,4 +9,6 @@ qtHaveModule(quick) { |
21 | SUBDIRS += qml-compositor | 21 | SUBDIRS += custom-extension |
22 | } | ||
23 | |||
24 | - SUBDIRS += server-buffer | ||
25 | + contains(QT_CONFIG, opengles2) { | ||
26 | + SUBDIRS += server-buffer | ||
27 | + } | ||
28 | } | 22 | } |
23 | |||
24 | -SUBDIRS += server-buffer | ||
25 | +contains(QT_CONFIG, opengles2) { | ||
26 | + SUBDIRS += server-buffer | ||
27 | +} | ||