[meta-freescale] [meta-fsl-arm][PATCH 4/4] qtbase: Remove distribution-related settings

[Alexandre Belloni]

Hi,

I just want to mention that removing icu will break any application
using qtwebkit (but not qtwebkit itself) when building with a distro
that does not add icu to the qtbase PACKAGECONFIG (like poky).

I'm not saying this shouldn't be done, I'm just warning that we may see
some reports of broken applications soon ;)


On 17/02/2015 at 10:49:24 -0200, Otavio Salvador wrote :
> The use of TSLib, ICU and availability of examples is a distribution
> configuration and not a BSP thing. Drop this settings from the
> bbappend.
> 
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> index 64966c2..3152956 100644
> --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> @@ -1,3 +1,4 @@
> +# Copyright (C) 2013-2015 O.S. Systems Software LTDA.
>  # Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
>  
>  FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> @@ -10,17 +11,15 @@ IS_MX6SL = "0"
>  IS_MX6SL_mx6sl = "1"
>  
>  PACKAGECONFIG_GL_mx5 = "gles2"
> -PACKAGECONFIG_append_mx5 = " tslib icu examples"
>  
>  PACKAGECONFIG_GL_mx6q = "gles2"
>  PACKAGECONFIG_GL_mx6dl = "gles2"
>  PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \
>                              ' gl', '', d)}"
> -PACKAGECONFIG_append_mx6 = " tslib icu examples"
>  QT_CONFIG_FLAGS_append_mx6q = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
>  QT_CONFIG_FLAGS_append_mx6dl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
>  QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', \
> -                            ' -no-eglfs', ' -no-opengl -linuxfb -no-icu -no-eglfs', d)}"
> +                            ' -no-eglfs', ' -no-opengl -linuxfb -no-eglfs', d)}"
>  
>  do_configure_prepend_mx5() {
>      sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
> -- 
> 2.1.4
> 
> -- 
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com