summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-02-14 18:37:41 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-02 11:22:23 +0100
commitf87ed4bdc60f38a42efdd6a418eb1d5c99933222 (patch)
tree30fc197bce059cc74f4eb3c6ea5c7037d1400630 /recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
parentb2d5376b41625521b9a081fe800345fff33d8dd6 (diff)
downloadmeta-qt5-f87ed4bdc60f38a42efdd6a418eb1d5c99933222.tar.gz
qt5: upgrade to latest revisions in 5.7 branches
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.patch19
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 36047570..a99fba79 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 @@
1From efec881d1bff247e6452a10a60821612c2585c67 Mon Sep 17 00:00:00 2001 1From 125478ea618c1329b210621bee6f6cdec5e81032 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 22 Feb 2014 17:47:44 +0100 3Date: Sat, 22 Feb 2014 17:47:44 +0100
4Subject: [PATCH] examples/wayland: include server-buffer only when building 4Subject: [PATCH] examples/wayland: include server-buffer only when building
@@ -14,18 +14,17 @@ 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
16diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro 16diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
17index d633fb9..643c7cd 100644 17index 91c68b8..9cfcefe 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@@ -8,4 +8,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+}
29-- 28--
302.7.0 292.7.0
31 30