]> code.ossystems Code Review - meta-freescale.git/commitdiff
qtbase: Remove distribution-related settings
authorOtavio Salvador <otavio@ossystems.com.br>
Mon, 16 Feb 2015 18:32:49 +0000 (16:32 -0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Thu, 19 Feb 2015 23:04:05 +0000 (21:04 -0200)
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 <otavio@ossystems.com.br>
meta-fsl-arm/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

index 64966c2924c04ae0dd1231464bcb7ba0842e7aff..de3380449521f679f4885e833d77b064aeefdb9b 100644 (file)
@@ -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