diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-10-03 01:46:10 +0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-04 14:22:51 +0100 |
commit | 4fc51a28bd171ea93fecee6326c69c6494023f76 (patch) | |
tree | aa7ca1530f3fbd84d056a19d49e3d35069e69986 /meta/recipes-qt/qt4/qt-4.7.4.inc | |
parent | da761df049249e1ca99eb569642246e51e5bae91 (diff) | |
download | openembedded-core-4fc51a28bd171ea93fecee6326c69c6494023f76.tar.gz openembedded-core-4fc51a28bd171ea93fecee6326c69c6494023f76.tar.bz2 openembedded-core-4fc51a28bd171ea93fecee6326c69c6494023f76.tar.xz openembedded-core-4fc51a28bd171ea93fecee6326c69c6494023f76.zip |
qt4: Fix translation support
The translation support was disable in build. The
fix-translation.patch was imported from OpenEmbedded to fix a linking
issue in phonon translation support.
[Dmitry Eremin-Solenikov: ported to apply to qt 4.7.4 build, bumped PR]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt-4.7.4.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc index 5c06bbe0c..bc33b6b1b 100644 --- a/meta/recipes-qt/qt4/qt-4.7.4.inc +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc @@ -13,6 +13,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. file://0009-support-2bpp.patch \ file://0001-Added-Openembedded-crossarch-option.patch \ file://blacklist-diginotar-certs.diff \ + file://fix-translations.patch \ file://g++.conf \ file://linux.conf \ file://fix-qtbug-20925.patch \ @@ -27,7 +28,9 @@ FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" do_configure_prepend() { for pro in $(find ${S} -name "*.pro") ; do - sed -i 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' $pro + sed -i \ + -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ + -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro done sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf @@ -39,10 +42,6 @@ do_configure_prepend() { ${S}/configure } -do_configure_append() { - sed -e '/QMAKE_TARGET /d' -e '/TARGET /d' -i ${S}/translations/Makefile -} - QT_GLFLAGS ?= "" QT_CONFIG_FLAGS += " -xmlpatterns -no-rpath -qt3support -reduce-relocations -silent ${QT_GLFLAGS}" |