diff options
author | Ross Burton <ross.burton@intel.com> | 2012-11-19 14:22:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-20 15:31:47 +0000 |
commit | 1f71583dacaf2abde4930815b3415c3af104f514 (patch) | |
tree | 205b617c5ad55675e2a050ace6c933e29d30ecf2 /meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch | |
parent | 4e2de8f749103a54d51f627e75401b70bb41d47c (diff) | |
download | poky-1f71583dacaf2abde4930815b3415c3af104f514.tar.gz |
qt4: remove 4.8.1
(From OE-Core rev: 5f6d7d61d79215ffe38aa6b122ae5ac0af7e859a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch deleted file mode 100644 index b788a68ece..0000000000 --- a/meta/recipes-qt/qt4/qt4-4.8.1/0014-translations-fix-phony-translation-linking-error.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 306e0987cfdc67db11abc7071c48b0d196e84c8e Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Wed, 26 Sep 2012 20:45:10 +0200 | ||
4 | Subject: [PATCH 14/22] translations: fix phony translation linking error | ||
5 | |||
6 | | .../usr/lib/crt1.o: In function `_start': | ||
7 | | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' | ||
8 | | collect2: ld returned 1 exit status | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | translations/translations.pro | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/translations/translations.pro b/translations/translations.pro | ||
18 | index dc99beb..0d98829 100644 | ||
19 | --- a/translations/translations.pro | ||
20 | +++ b/translations/translations.pro | ||
21 | @@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} | ||
22 | updateqm.CONFIG += no_link | ||
23 | QMAKE_EXTRA_COMPILERS += updateqm | ||
24 | |||
25 | -isEmpty(vcproj) { | ||
26 | +!isEmpty(vcproj) { | ||
27 | QMAKE_LINK = @: IGNORE THIS LINE | ||
28 | OBJECTS_DIR = | ||
29 | win32:CONFIG -= embed_manifest_exe | ||
30 | @@ -111,7 +111,7 @@ isEmpty(vcproj) { | ||
31 | phony_src.input = PHONY_DEPS | ||
32 | phony_src.output = phony.c | ||
33 | phony_src.variable_out = GENERATED_SOURCES | ||
34 | - phony_src.commands = echo int main() { return 0; } > phony.c | ||
35 | + phony_src.commands = echo \"int main() { return 0; }\" > phony.c | ||
36 | phony_src.name = CREATE phony.c | ||
37 | phony_src.CONFIG += combine | ||
38 | QMAKE_EXTRA_COMPILERS += phony_src | ||
39 | -- | ||
40 | 1.7.12 | ||
41 | |||