From 47d31abef49494b408f6ba004638bac007782947 Mon Sep 17 00:00:00 2001 From: "Peter A. Bigot" Date: Tue, 17 Feb 2015 15:08:04 +0200 Subject: qt-mobility: select distro preference for bluez provider Signed-off-by: Peter A. Bigot Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/recipes-qt') 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 -- cgit 1.2.3-korg