[oe] [meta-qt5][master][jethro][PATCH] qtconnectivity, qtsystems: fix bluetooth support

[Martin Jansa]

On Mon, Jan 04, 2016 at 04:59:54PM +0100, Javier Viguera wrote:
> 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.

Is it deterministic?

Will it always pick bluez4 when BLUEZ is set to bluez4, but there is
bluez5 is already in the sysroot as well?

config.tests/bluez/bluez.pro is only using pkgconfig to find bluez, so
I'm not sure which one will win.

> Signed-off-by: Javier Viguera <javier.viguera at digi.com>
> ---
>  recipes-qt/qt5/qtconnectivity_git.bb | 9 ++++++---
>  recipes-qt/qt5/qtsystems_git.bb      | 9 ++++++---
>  2 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
> index b1e155e2b48d..f677f7107465 100644
> --- a/recipes-qt/qt5/qtconnectivity_git.bb
> +++ b/recipes-qt/qt5/qtconnectivity_git.bb
> @@ -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
>  }
> diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
> index 27d2bff37b51..9d9d245d2d09 100644
> --- a/recipes-qt/qt5/qtsystems_git.bb
> +++ b/recipes-qt/qt5/qtsystems_git.bb
> @@ -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
>  }
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20160104/10c12db0/attachment-0002.sig>