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 22:29:23 +0100 |
commit | 13e659facb76747bc847c569dfc9ba8807ecf068 (patch) | |
tree | 309f45c8806b5f3e64b8de198cdd826f2dcc5540 /meta/recipes-qt/qt4/qt-4.7.4 | |
parent | c88b9915267f9a89983bb58faf3c30fe1dcdab43 (diff) | |
download | poky-13e659facb76747bc847c569dfc9ba8807ecf068.tar.gz |
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]
(From OE-Core rev: 4fc51a28bd171ea93fecee6326c69c6494023f76)
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 @@ | |||
1 | fix phony translation linking error | ||
2 | |||
3 | | .../usr/lib/crt1.o: In function `_start': | ||
4 | | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' | ||
5 | | collect2: ld returned 1 exit status | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
10 | |||
11 | diff --git a/translations/translations.pro b/translations/translations.pro | ||
12 | index cdaf04a..24fa668 100644 | ||
13 | --- a/translations/translations.pro | ||
14 | +++ b/translations/translations.pro | ||
15 | @@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} | ||
16 | updateqm.CONFIG += no_link | ||
17 | QMAKE_EXTRA_COMPILERS += updateqm | ||
18 | |||
19 | -isEmpty(vcproj) { | ||
20 | +!isEmpty(vcproj) { | ||
21 | QMAKE_LINK = @: IGNORE THIS LINE | ||
22 | OBJECTS_DIR = | ||
23 | win32:CONFIG -= embed_manifest_exe | ||
24 | @@ -30,7 +30,7 @@ isEmpty(vcproj) { | ||
25 | phony_src.input = PHONY_DEPS | ||
26 | phony_src.output = phony.c | ||
27 | phony_src.variable_out = GENERATED_SOURCES | ||
28 | - phony_src.commands = echo int main() { return 0; } > phony.c | ||
29 | + phony_src.commands = echo \"int main() { return 0; }\" > phony.c | ||
30 | phony_src.name = CREATE phony.c | ||
31 | phony_src.CONFIG += combine | ||
32 | QMAKE_EXTRA_COMPILERS += phony_src | ||