diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-02-03 17:12:39 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-08 14:19:10 +0100 |
commit | 909858baf064216a3b221edb59b40cc93d536a44 (patch) | |
tree | 98c17fe59d2fe43d1200d8e590bcd793dc893f4c /recipes-qt/qt5/qtwayland_git.bb | |
parent | 8e70eeb90910b46057fd29a16858de93d42717d5 (diff) | |
download | meta-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/qtwayland_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 059c2dbc..128794c9 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -20,11 +20,9 @@ DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native ${XKB_D | |||
20 | 20 | ||
21 | QT_WAYLAND_CONFIG ?= "wayland-compositor" | 21 | QT_WAYLAND_CONFIG ?= "wayland-compositor" |
22 | QT_WAYLAND_DEFINES ?= "" | 22 | QT_WAYLAND_DEFINES ?= "" |
23 | QT_WAYLAND_BUILD_PARTS ?= "examples" | ||
24 | 23 | ||
25 | EXTRA_QMAKEVARS_PRE += "CONFIG+=${QT_WAYLAND_CONFIG}" | 24 | EXTRA_QMAKEVARS_PRE += "CONFIG+=${QT_WAYLAND_CONFIG}" |
26 | EXTRA_QMAKEVARS_PRE += "DEFINES+=${QT_WAYLAND_DEFINES}" | 25 | EXTRA_QMAKEVARS_PRE += "DEFINES+=${QT_WAYLAND_DEFINES}" |
27 | EXTRA_QMAKEVARS_PRE += "QT_BUILD_PARTS+=${QT_WAYLAND_BUILD_PARTS}" | ||
28 | 26 | ||
29 | FILES_${PN}-plugins += " \ | 27 | FILES_${PN}-plugins += " \ |
30 | ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \ | 28 | ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \ |