summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe F. Tonello <ftonello@cercacor.com>2013-03-13 09:49:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-18 13:17:38 +0000
commitccc76f42590430b2c5d286c72e6a01a21b29a9a3 (patch)
tree7489bb57d15c60a9b3565ae4b31879238d64d9a3
parent9f46e4c195e4d8bc638191428492e09f1e57cc76 (diff)
downloadopenembedded-core-ccc76f42590430b2c5d286c72e6a01a21b29a9a3.tar.gz
openembedded-core-ccc76f42590430b2c5d286c72e6a01a21b29a9a3.tar.bz2
openembedded-core-ccc76f42590430b2c5d286c72e6a01a21b29a9a3.zip
qt-mobility: Add bluez dependency if DISTRO_FEATURES has bluetooth
Some modules doesn't requires bluez4 to compile. So it's unnecessary to have it as dependency. Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc7
1 files changed, 5 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 777863006e..e5e671e7e6 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -1,5 +1,6 @@
HOMEPAGE = "http://qt.nokia.com"
-DEPENDS += "pulseaudio bluez4"
+DEPENDS += "pulseaudio"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
@@ -30,6 +31,8 @@ qtm_plugins := "/usr/lib/${qtm_dir}/plugins/QtMobility"
qtm_data := "/usr/share/${qtm_dir}"
qtm_imports := "/usr/lib/${qtm_dir}/imports"
+qtm_bluezflag ?= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'yes', 'no', d)}"
+
do_configure_prepend() {
cp qtmobility.pro qtmobility.pro.old
sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@' <qtmobility.pro.old >qtmobility.pro
@@ -49,7 +52,7 @@ do_configure_prepend() {
echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
echo QT_CONFIG ${qtm_glflags} >>./config.pri
- echo bluez_enabled = yes >>./config.pri
+ echo bluez_enabled = ${qtm_bluezflag} >>./config.pri
echo ${qtm_extra_config} >>./config.pri
echo CONFIG += ${qtm_embedded} >>./config.pri
}