diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-01 16:07:21 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-04 12:24:48 +0200 |
commit | 82b211aa423cd9ae46422823139b24a07e8b0fa9 (patch) | |
tree | 89773eaf652d9198cfcf86c6150a1569ce117b1b /recipes-qt/qt5/qtwebkit | |
parent | 48ee17af942ac9860e834c8dec049370e7802a56 (diff) | |
download | meta-qt5-82b211aa423cd9ae46422823139b24a07e8b0fa9.tar.gz |
qt5: upgrade to latest revision in 5.4 branches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch index 886a954d..09876dba 100644 --- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b3d43d2b8c1e11122ac36e3e0b102c2ffef83010 Mon Sep 17 00:00:00 2001 | 1 | From 5a9e19d69e4443ab6272aeca6d707e39fe1943ef Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Woerner <trevor.woerner@linaro.org> | 2 | From: Trevor Woerner <trevor.woerner@linaro.org> |
3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 | 3 | Date: Fri, 7 Feb 2014 04:07:17 +0100 |
4 | Subject: [PATCH 1/2] qtwebkit: fix QA issue (bad RPATH) | 4 | Subject: [PATCH 1/2] qtwebkit: fix QA issue (bad RPATH) |
@@ -26,5 +26,5 @@ index fd66af6..ef754c3 100644 | |||
26 | CONFIG(debug, debug|release)|force_debug_info { | 26 | CONFIG(debug, debug|release)|force_debug_info { |
27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. | 27 | # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. |
28 | -- | 28 | -- |
29 | 2.3.5 | 29 | 2.4.2 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch index de21a7c3..e384282b 100644 --- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 491cbd653eb7b992202f06bd2e62cf29f5f495af Mon Sep 17 00:00:00 2001 | 1 | From 22cad8ae3c1b8601ebf785ef5dfda4516056ee53 Mon Sep 17 00:00:00 2001 |
2 | From: Magnus Granberg <zorry@gentoo.org> | 2 | From: Magnus Granberg <zorry@gentoo.org> |
3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 | 3 | Date: Fri, 27 Feb 2015 11:55:09 +0100 |
4 | Subject: [PATCH 2/2] Remove TEXTREL tag in x86 | 4 | Subject: [PATCH 2/2] Remove TEXTREL tag in x86 |
@@ -75,5 +75,5 @@ index 0a2fe78..2dc40ef 100644 | |||
75 | #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) | 75 | #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) |
76 | #endif | 76 | #endif |
77 | -- | 77 | -- |
78 | 2.3.5 | 78 | 2.4.2 |
79 | 79 | ||