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 | |
| parent | da761df049249e1ca99eb569642246e51e5bae91 (diff) | |
| download | openembedded-core-4fc51a28bd171ea93fecee6326c69c6494023f76.tar.gz openembedded-core-4fc51a28bd171ea93fecee6326c69c6494023f76.tar.bz2 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')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch new file mode 100644 index 0000000000..906d4e312f --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch @@ -0,0 +1,32 @@ +fix phony translation linking error + + | .../usr/lib/crt1.o: In function `_start': + | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' + | collect2: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> + +diff --git a/translations/translations.pro b/translations/translations.pro +index cdaf04a..24fa668 100644 +--- a/translations/translations.pro ++++ b/translations/translations.pro +@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} + updateqm.CONFIG += no_link + QMAKE_EXTRA_COMPILERS += updateqm + +-isEmpty(vcproj) { ++!isEmpty(vcproj) { + QMAKE_LINK = @: IGNORE THIS LINE + OBJECTS_DIR = + win32:CONFIG -= embed_manifest_exe +@@ -30,7 +30,7 @@ isEmpty(vcproj) { + phony_src.input = PHONY_DEPS + phony_src.output = phony.c + phony_src.variable_out = GENERATED_SOURCES +- phony_src.commands = echo int main() { return 0; } > phony.c ++ phony_src.commands = echo \"int main() { return 0; }\" > phony.c + phony_src.name = CREATE phony.c + phony_src.CONFIG += combine + QMAKE_EXTRA_COMPILERS += phony_src |