diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-18 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-30 14:15:29 +0100 |
commit | 69b7d8f725b0c431d61a224dbf13a7575531404f (patch) | |
tree | 645ba6820f43750ca643ec997091a88fd92d210e /recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |
parent | 9a4c0b393bf031acace5c2cc00d625a24c639d1c (diff) | |
download | meta-qt5-69b7d8f725b0c431d61a224dbf13a7575531404f.tar.gz |
qt5: upgrade git recipes to 5.4-beta1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch')
-rw-r--r-- | recipes-qt/qt5/qtwayland-git/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-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 new file mode 100644 index 00000000..1af124a6 --- /dev/null +++ b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 9c98c0c411ecaf4cb95b76d0c07e72af75a8d7f0 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.1 | ||
31 | |||