diff options
author | Jonathan Liu <net147@gmail.com> | 2014-12-11 15:52:18 +1100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 13:24:22 +0100 |
commit | 6566f728ab3d14a4908516fb13ad555dbfe04471 (patch) | |
tree | d73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |
parent | c9a1041cb956d94c04cbf635b00ca19725ffc129 (diff) | |
download | meta-qt5-6566f728ab3d14a4908516fb13ad555dbfe04471.tar.gz |
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@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 | 31 |
1 files changed, 31 insertions, 0 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 new file mode 100644 index 00000000..664fa3f9 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From cd1e17e8c6082fe8578d64baaff55f1f00c0f7a0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 | ||
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | ||
5 | with opengles2 | ||
6 | |||
7 | * it's using glBindBuffer in | ||
8 | server-buffer/client/serverbufferrenderer.cpp | ||
9 | |||
10 | Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | examples/wayland/wayland.pro | 4 +++- | ||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro | ||
17 | index d633fb9..643c7cd 100644 | ||
18 | --- a/examples/wayland/wayland.pro | ||
19 | +++ b/examples/wayland/wayland.pro | ||
20 | @@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { | ||
21 | SUBDIRS += qml-compositor | ||
22 | } | ||
23 | |||
24 | - SUBDIRS += server-buffer | ||
25 | + contains(QT_CONFIG, opengles2) { | ||
26 | + SUBDIRS += server-buffer | ||
27 | + } | ||
28 | } | ||
29 | -- | ||
30 | 2.1.3 | ||
31 | |||