aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-04-28 22:20:37 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-04-29 19:14:50 +0200
commit0ab5d22db2c58ccb52aadea91032ddc7e699e4d4 (patch)
tree51a630a4900ddbe8448afff02c02073f71d2f5f4
parentb72ed64334d6bec21574481be6eec8a9252ab207 (diff)
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 <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtsystems.inc11
1 files changed, 10 insertions, 1 deletions
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