[oe-commits] Peter A. Bigot : qt-mobility: select distro preference for bluez provider

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: de18933064b523229e990e0991f4818457c01508
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=de18933064b523229e990e0991f4818457c01508

Author: Peter A. Bigot <pab at pabigot.com>
Date:   Mon Feb 16 17:06:14 2015 +0200

qt-mobility: select distro preference for bluez provider

Signed-off-by: Peter A. Bigot <pab at pabigot.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 ae1769d..b3d23d4 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"