Patchwork qtbase: Fix QT_CONFIG_FLAGS to work for non-X11.

login
register
mail settings
Submitter Ann Thornton
Date March 24, 2014, 5:33 p.m.
Message ID <1395682414-31226-1-git-send-email-ra43240@freescale.com>
Download mbox | patch
Permalink /patch/69075/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Ann Thornton - March 24, 2014, 5:33 p.m.
eglfs is needed for FB and Wayland backends.

Signed-off-by: Ann Thornton <ra43240@freescale.com>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Daiane Angolini - March 24, 2014, 6:02 p.m.
> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Ann Thornton
> Sent: Monday, March 24, 2014 2:34 PM
> To: meta-freescale@yoctoproject.org
> Subject: [meta-freescale] [PATCH] qtbase: Fix QT_CONFIG_FLAGS to work for
> non-X11.
> 
> eglfs is needed for FB and Wayland backends.

This patch is OK for me.

Acked-by: Daiane Angolini <Daiane.angolini@freescale.com>

> 
> Signed-off-by: Ann Thornton <ra43240@freescale.com>
> ---
>  qt5-layer/recipes-qt/qt5/qtbase_%.bbappend |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-
> layer/recipes-qt/qt5/qtbase_%.bbappend
> index c1df764..20fc15f 100644
> --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
> @@ -11,7 +11,7 @@ PACKAGECONFIG_append_mx5 = " tslib icu examples"
> 
>  PACKAGECONFIG_GL_mx6 = "gles2"
>  PACKAGECONFIG_append_mx6 = " tslib icu examples"
> -QT_CONFIG_FLAGS_append_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '
> -no-eglfs', '', d)}"
> +QT_CONFIG_FLAGS_append_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', '
> -no-eglfs', ' -eglfs', d)}"
> 
>  do_configure_prepend_mx5() {
>      sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
> --
> 1.7.9.5
> 
> 
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale
>
Otavio Salvador - March 24, 2014, 6:07 p.m.
Hello Ann,
Hello Daiane,

On Mon, Mar 24, 2014 at 3:02 PM, Daiane.Angolini@freescale.com
<Daiane.Angolini@freescale.com> wrote:
>> -----Original Message-----
>> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
>> bounces@yoctoproject.org] On Behalf Of Ann Thornton
>> Sent: Monday, March 24, 2014 2:34 PM
>> To: meta-freescale@yoctoproject.org
>> Subject: [meta-freescale] [PATCH] qtbase: Fix QT_CONFIG_FLAGS to work for
>> non-X11.
>>
>> eglfs is needed for FB and Wayland backends.
>
> This patch is OK for me.
>
> Acked-by: Daiane Angolini <Daiane.angolini@freescale.com>

Great. Queued it.

Patch

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index c1df764..20fc15f 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -11,7 +11,7 @@  PACKAGECONFIG_append_mx5 = " tslib icu examples"
 
 PACKAGECONFIG_GL_mx6 = "gles2"
 PACKAGECONFIG_append_mx6 = " tslib icu examples"
-QT_CONFIG_FLAGS_append_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', '', d)}"
+QT_CONFIG_FLAGS_append_mx6 = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
 
 do_configure_prepend_mx5() {
     sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf