diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-20 11:38:06 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-21 21:36:18 +0200 |
| commit | 754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch) | |
| tree | a417716816e08846114d65394239c309bc129dbd /recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | |
| parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) | |
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
and
qtwebkit/0004-Fix-linking-with-libpthread.patch
were resolved upstream
* all patches were refreshed with:
git format-patch --no-numbered --no-signature -NUMBER
to remove numbering from Subject (it's good enough in filename) and to
remove git version from signature (so it doesn't look differently when
generated on different hosts with different git version).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | 7 |
1 files changed, 2 insertions, 5 deletions
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 b3a86159..2114b42c 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,7 +1,7 @@ -From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001 +From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001 From: Magnus Granberg <zorry@gentoo.org> Date: Fri, 27 Feb 2015 11:55:09 +0100 -Subject: [PATCH 2/3] Remove TEXTREL tag in x86 +Subject: [PATCH] Remove TEXTREL tag in x86 Fix textrel QA warnings when building qtwebkit for x86: @@ -74,6 +74,3 @@ index 0a2fe78..2dc40ef 100644 #else #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) #endif --- -2.7.0 - |