From 0ab5d22db2c58ccb52aadea91032ddc7e699e4d4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 Apr 2015 22:20:37 +0200 Subject: qtsystems: add packageconfig for bluez4 and disable it by default * bluez5 is now enabled by default and conflicts with bluez4 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtsystems.inc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc index cd2438f3..e9b14aeb 100644 --- a/recipes-qt/qt5/qtsystems.inc +++ b/recipes-qt/qt5/qtsystems.inc @@ -1,6 +1,15 @@ require qt5.inc -DEPENDS += "qtbase qtdeclarative udev bluez4 gconf" +DEPENDS += "qtbase qtdeclarative udev gconf" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[bluez4] = "OE_BLUEZ_ENABLED,,bluez4" + +do_configure_prepend() { + export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" + # disable bluez test if it isn't enabled by PACKAGECONFIG + sed -i 's/^ qtCompileTest(bluez)/ OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtsystems.pro +} do_install_append() { # Remove example.pro file as it is useless -- cgit v1.2.3