summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorPeter A. Bigot <pab@pabigot.com>2015-02-17 15:08:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 13:43:40 +0000
commit3f8c532e6d478afcae15580bfe3ec33f89319d50 (patch)
treee63f199c8f0757e6cbf1dce8748e4e507553a64e /meta/recipes-qt/qt4
parent9571ccb2dd85ec4125c4f56524514402cb18ce85 (diff)
downloadpoky-3f8c532e6d478afcae15580bfe3ec33f89319d50.tar.gz
qt-mobility: select distro preference for bluez provider
(From OE-Core rev: 47d31abef49494b408f6ba004638bac007782947) Signed-off-by: Peter A. Bigot <pab@pabigot.com> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index ae1769de3a..5758e1e346 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -1,9 +1,11 @@
1HOMEPAGE = "http://qt-project.org/" 1HOMEPAGE = "http://qt-project.org/"
2DEPENDS = "gstreamer util-linux" 2DEPENDS = "gstreamer util-linux"
3 3
4inherit bluetooth
5
4PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 6PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
5 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" 7 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
6PACKAGECONFIG[bluetooth] = ",,bluez4" 8PACKAGECONFIG[bluez4] = ",,bluez4"
7PACKAGECONFIG[pulseaudio] = ",,pulseaudio" 9PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
8 10
9LICENSE = "LGPLv2.1" 11LICENSE = "LGPLv2.1"
@@ -65,7 +67,7 @@ maemo5-contacts_enabled = no
65maemo5-calendar_enabled = no 67maemo5-calendar_enabled = no
66maemo6-landmarks_enabled = no 68maemo6-landmarks_enabled = no
67bme_enabled = no 69bme_enabled = no
68bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)} 70bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluez4', 'yes', 'no', d)}
69proj_enabled = no 71proj_enabled = no
70gstreamer-photography_enabled = no 72gstreamer-photography_enabled = no
71gstreamer-appsrc_enabled = yes 73gstreamer-appsrc_enabled = yes