From 2e9c8007bca684149d72e96423f30433b6665fad Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 20 Jun 2013 23:19:53 +1000 Subject: qt4: add eglibc-gconv-utf-16 to QtCore RRECOMMENDS when using glibc This fixes the following warnings when running Qt applications: QIconvCodec::convertFromUnicode: using Latin-1 for conversion, iconv_open failed QIconvCodec::convertToUnicode: using Latin-1 for conversion, iconv_open failed Qt's QString class stores strings internally using UTF-16 encoding. The UTF-16 iconv module is needed to convert between the system's local 8-bit representation and QString's UTF-16 encoding. For example, the following functions would be affected: QString::fromLocal8Bit(...) QString::toLocal8Bit(...) If the UTF-16 iconv module couldn't be loaded, it would use Latin-1 encoding instead of the system's encoding for conversion. [YOCTO #349] Signed-off-by: Jonathan Liu Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 828e30af79..ebe0ea501b 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -134,6 +134,7 @@ FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch" RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" +RRECOMMENDS_${QT_BASE_LIB}core4_append_libc-glibc = " eglibc-gconv-utf-16" RRECOMMENDS_${QT_BASE_NAME}-demos += " \ ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ -- cgit 1.2.3-korg