summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb4
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb4
2 files changed, 2 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 414ce334..00c161d3 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -14,10 +14,8 @@ SRC_URI += "file://0001-Add-missing-header-for-errno.patch"
14 14
15DEPENDS += "qtbase qtdeclarative" 15DEPENDS += "qtbase qtdeclarative"
16 16
17inherit bluetooth
18
19PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" 17PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
20PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" 18PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
21 19
22EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
23 21
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 05741de7..5f5e1ad8 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative udev gconf" 13DEPENDS += "qtbase qtdeclarative udev gconf"
14 14
15inherit bluetooth
16
17PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" 15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
18PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" 16PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,bluez5"
19 17
20EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 18EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
21 19