t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-16 20:21:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtconnectivity, qtsystems: fix bluetooth support

Browse Source 
QMAKE_CACHE_EVAL is only used in qtwebengine and qtwebkit, but not in
the rest of the QT5 packages, so use EXTRA_QMAKEVARS_PRE to pass the
packageconfig options to the do_configure task.

Also generalize bluetooth support so it can be used not only with bluez4
but with bluez5 as well.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Javier Viguera
2016-01-04 16:59:54 +01:00
committed by Martin Jansa
parent aac80246da
commit 9f3f9e10bf
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
recipes-qt/qt5/qtconnectivity_git.bb
View File

@@ -13,11 +13,14 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
PACKAGECONFIG ??= ""
PACKAGECONFIG[bluez4] = "OE_BLUEZ_ENABLED,,bluez4"
inherit bluetooth
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}"
EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
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
}

9
recipes-qt/qt5/qtsystems_git.bb
View File

@@ -11,11 +11,14 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative udev gconf"
PACKAGECONFIG ??= ""
PACKAGECONFIG[bluez4] = "OE_BLUEZ_ENABLED,,bluez4"
inherit bluetooth
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
PACKAGECONFIG[bluez] = "CONFIG+=OE_BLUEZ_ENABLED,,${BLUEZ}"
EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
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}/qtsystems.pro
}