From 0bee7526a4b9c285756c76a09eaacaa8a4f037c8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 16 Feb 2015 16:32:49 -0200 Subject: [PATCH] qtbase: Remove distribution-related settings The use of TSLib, ICU and availability of examples is a distribution configuration and not a BSP thing. Drop this settings from the bbappend. WARNING ------- This breaks QtWebKit based applications, as OE-Core and Poky distros does not add 'icu' to the DISTRO_FEATURES list. Change-Id: Ief633eab9473c3fddd359132ce7196e30b3ea293 Signed-off-by: Otavio Salvador --- meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 64966c29..de338044 100644 --- a/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -10,17 +10,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.40.1