From 7f0d7901adf6ba17663179bdcfa054632de65b5c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 28 Apr 2015 22:19:59 +0200 Subject: [PATCH] qtconnectivity: improve PACKAGECONFIG handling (From meta-qt5 rev: 5a67ecd3d782c3622f2405e4562261070f50f5e2) Signed-off-by: Martin Jansa Signed-off-by: Mauro Carvalho Chehab --- meta-qt5/recipes-qt/qt5/qtconnectivity.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-qt5/recipes-qt/qt5/qtconnectivity.inc b/meta-qt5/recipes-qt/qt5/qtconnectivity.inc index 10dcc22..ab8d31e 100644 --- a/meta-qt5/recipes-qt/qt5/qtconnectivity.inc +++ b/meta-qt5/recipes-qt/qt5/qtconnectivity.inc @@ -3,14 +3,13 @@ require qt5.inc DEPENDS += "qtbase qtdeclarative" PACKAGECONFIG ??= "" -PACKAGECONFIG[bluez4] = ",,bluez4" +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}/qtconnectivity.pro } -EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'bluez4', 'CONFIG+=OE_BLUEZ_ENABLED', '', d)}" - LICENSE += "| GPL-2.0" LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" -- 2.7.4