From 6a666561613ae750478e9410c66559cb5dd75819 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 25 Jan 2016 16:17:21 +0100 Subject: [PATCH] qtconnectivity, qtsystems: fix bluetooth support Generalize bluetooth support so it can be used not only with bluez4 but with bluez5 as well. Use EXTRA_QMAKEVARS_PRE to pass the packageconfig options to the do_configure task. https://jira.digi.com/browse/DEL-2147 Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-qt/qt5/qtconnectivity_git.bbappend | 8 ++++++++ meta-digi-dey/recipes-qt/qt5/qtsystems_git.bbappend | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 meta-digi-dey/recipes-qt/qt5/qtconnectivity_git.bbappend create mode 100644 meta-digi-dey/recipes-qt/qt5/qtsystems_git.bbappend diff --git a/meta-digi-dey/recipes-qt/qt5/qtconnectivity_git.bbappend b/meta-digi-dey/recipes-qt/qt5/qtconnectivity_git.bbappend new file mode 100644 index 000000000..64ddef30d --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -0,0 +1,8 @@ +# Copyright (C) 2016 Digi International + +inherit bluetooth + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" +PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" + +EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}" diff --git a/meta-digi-dey/recipes-qt/qt5/qtsystems_git.bbappend b/meta-digi-dey/recipes-qt/qt5/qtsystems_git.bbappend new file mode 100644 index 000000000..64ddef30d --- /dev/null +++ b/meta-digi-dey/recipes-qt/qt5/qtsystems_git.bbappend @@ -0,0 +1,8 @@ +# Copyright (C) 2016 Digi International + +inherit bluetooth + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" +PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" + +EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"