summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit-examples
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2016-02-03 17:12:39 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-02-08 14:19:10 +0100
commit909858baf064216a3b221edb59b40cc93d536a44 (patch)
tree98c17fe59d2fe43d1200d8e590bcd793dc893f4c /recipes-qt/qt5/qtwebkit-examples
parent8e70eeb90910b46057fd29a16858de93d42717d5 (diff)
downloadmeta-qt5-909858baf064216a3b221edb59b40cc93d536a44.tar.gz
qt5: use common PACKAGECONFIG to build examples
Each Qt module's examples can now be enabled with PACKAGECONFIG. Replace the webkit patch with a PACKAGECONFIG option and follow common practice by not building QtWayland examples by default, those can be enabled in a .bbappend with PACKAGECONFIG += "examples" Enabling PACKAGECONFIG[examples] in qtbase, will still cause every Qt module to build their examples. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit-examples')
-rw-r--r--recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
deleted file mode 100644
index 3034f950..00000000
--- a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 8900f45818b7f181d2b57ceebdf086c78d2ee6b0 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 8 Oct 2013 00:18:10 -0400
4Subject: [PATCH] qtwebkit-examples: enable building examples by default
5
6Examples are provided in sources, but the build for them is not enabled by
7default. Since example binaries are packaged separately to ${PN}-examples,
8having them built by default makes more sense.
9
10Upstream-Status: Inappropriate [configuration]
11
12Signed-off-by: Denys Dmytriyenko <denys@ti.com>
13---
14 qtwebkit-examples.pro | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro
18index 3fcecf1..2da8a36 100644
19--- a/qtwebkit-examples.pro
20+++ b/qtwebkit-examples.pro
21@@ -2,4 +2,4 @@ requires(qtHaveModule(webkit))
22
23 load(qt_parts)
24
25-SUBDIRS += doc
26+SUBDIRS += doc examples
27--
282.6.1
29