diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-28 22:19:59 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 19:14:50 +0200 |
| commit | b72ed64334d6bec21574481be6eec8a9252ab207 (patch) | |
| tree | 102ee685575d0dc59c72014cec45bc52f4efcfae | |
| parent | 605432c638e87a079cf116c0c2897fc7b135256d (diff) | |
qtconnectivity: improve PACKAGECONFIG handling
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtconnectivity.inc b/recipes-qt/qt5/qtconnectivity.inc index 10dcc220..ab8d31e5 100644 --- a/recipes-qt/qt5/qtconnectivity.inc +++ b/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" |