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/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |
parent | f636eb7444a3454f2a25275a07e414d7409734d7 (diff) | |
download | meta-qt5-754aaadc7f0a1c98a4895899617afbaef0f1cdfa.tar.gz |
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/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch index a1ea375f..75350c17 100644 --- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 90d2f7aefa8922c3aa29e6907c1520c814d1797f Mon Sep 17 00:00:00 2001 | 1 | From 04be78d20ecc23e289e171e907bb5daf9393619d Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | 3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 |
4 | Subject: [PATCH 1/2] <chromium> base.gypi: include | 4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc |
5 | atomicops_internals_x86_gcc.cc when building for x64 arch | 5 | when building for x64 arch |
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
8 | --- | 8 | --- |
@@ -22,6 +22,3 @@ index b860735..0ed5de3 100644 | |||
22 | 'sources/': [ | 22 | 'sources/': [ |
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | 23 | ['include', 'atomicops_internals_x86_gcc.cc'], |
24 | ], | 24 | ], |
25 | -- | ||
26 | 2.7.0 | ||
27 | |||