From c978dd1cf10f4391919e6760eb6691dd1a7034b6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 12 Jul 2019 11:58:19 -0700 Subject: qtconnectivity,qtsystems: Account for bluez4 from oe-core bluez4 has been deprecated for few years now it has been removed completely from oe-core Signed-off-by: Khem Raj --- recipes-qt/qt5/qtconnectivity_git.bb | 4 +--- recipes-qt/qt5/qtsystems_git.bb | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5') 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" DEPENDS += "qtbase qtdeclarative" -inherit bluetooth - PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" +PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 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 = " \ DEPENDS += "qtbase qtdeclarative udev gconf" -inherit bluetooth - PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}" +PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,bluez5" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -- cgit v1.2.3-54-g00ecf