aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
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:42:25 +0000
commit47d31abef49494b408f6ba004638bac007782947 (patch)
tree0901e93c5ceaef422ed6d2d1c5dc163a66372237 /meta/recipes-qt
parentf15ca5902e5feead3848d01599f3c75e3c450087 (diff)
downloadopenembedded-core-contrib-47d31abef49494b408f6ba004638bac007782947.tar.gz
openembedded-core-contrib-47d31abef49494b408f6ba004638bac007782947.tar.bz2
openembedded-core-contrib-47d31abef49494b408f6ba004638bac007782947.zip
qt-mobility: select distro preference for bluez provider
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')
-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 @@
HOMEPAGE = "http://qt-project.org/"
DEPENDS = "gstreamer util-linux"
+inherit bluetooth
+
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
-PACKAGECONFIG[bluetooth] = ",,bluez4"
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG[bluez4] = ",,bluez4"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
LICENSE = "LGPLv2.1"
@@ -65,7 +67,7 @@ maemo5-contacts_enabled = no
maemo5-calendar_enabled = no
maemo6-landmarks_enabled = no
bme_enabled = no
-bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)}
+bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluez4', 'yes', 'no', d)}
proj_enabled = no
gstreamer-photography_enabled = no
gstreamer-appsrc_enabled = yes