diff options
author | Jonathan Liu <net147@gmail.com> | 2013-07-04 09:50:32 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:44:13 +0100 |
commit | 0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8 (patch) | |
tree | dbf652bc6adf22bc60c0fc5f9d77f21de9f5fa5b /meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch | |
parent | 262fa7ee4608c02e41092d3dccaf81463dd4f833 (diff) | |
download | poky-0463e5c173fed7f081760dea6e8f1bbe4cdbb2e8.tar.gz |
qt4: upgrade to 4.8.5
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin
shared libraries outside of libdir.
(From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch b/meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch new file mode 100644 index 0000000000..45b8c10fbe --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From e129dc0d6cde69dd15d1836c4111e0526fc29161 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
3 | Date: Wed, 26 Sep 2012 20:33:49 +0200 | ||
4 | Subject: [PATCH 09/21] qmake: fix source file references in qmake.pri | ||
5 | |||
6 | Fix duplicate entries in SOURCES and HEADERS, and fix the source file | ||
7 | list for the split of qlocale.cpp. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | --- | ||
14 | qmake/qmake.pri | 8 ++++---- | ||
15 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
16 | |||
17 | diff --git a/qmake/qmake.pri b/qmake/qmake.pri | ||
18 | index 31f67f4..9081669 100644 | ||
19 | --- a/qmake/qmake.pri | ||
20 | +++ b/qmake/qmake.pri | ||
21 | @@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ | ||
22 | generators/symbian/initprojectdeploy_symbian.cpp \ | ||
23 | generators/integrity/gbuild.cpp \ | ||
24 | windows/registry.cpp \ | ||
25 | - symbian/epocroot.cpp \ | ||
26 | - generators/integrity/gbuild.cpp | ||
27 | + symbian/epocroot.cpp | ||
28 | |||
29 | HEADERS += project.h property.h generators/makefile.h \ | ||
30 | generators/unix/unixmake.h meta.h option.h cachekeys.h \ | ||
31 | @@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \ | ||
32 | generators/symbian/initprojectdeploy_symbian.h \ | ||
33 | generators/integrity/gbuild.h \ | ||
34 | windows/registry_p.h \ | ||
35 | - symbian/epocroot_p.h \ | ||
36 | - generators/integrity/gbuild.h | ||
37 | + symbian/epocroot_p.h | ||
38 | |||
39 | contains(QT_EDITION, OpenSource) { | ||
40 | DEFINES += QMAKE_OPENSOURCE_EDITION | ||
41 | @@ -72,6 +70,8 @@ bootstrap { #Qt code | ||
42 | qlist.cpp \ | ||
43 | qlinkedlist.cpp \ | ||
44 | qlocale.cpp \ | ||
45 | + qlocale_tools.cpp \ | ||
46 | + qlocale_unix.cpp \ | ||
47 | qmalloc.cpp \ | ||
48 | qmap.cpp \ | ||
49 | qmetatype.cpp \ | ||
50 | -- | ||
51 | 1.8.0 | ||
52 | |||