diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-14 18:37:41 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-02 11:22:23 +0100 |
commit | f87ed4bdc60f38a42efdd6a418eb1d5c99933222 (patch) | |
tree | 30fc197bce059cc74f4eb3c6ea5c7037d1400630 /recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |
parent | b2d5376b41625521b9a081fe800345fff33d8dd6 (diff) | |
download | meta-qt5-f87ed4bdc60f38a42efdd6a418eb1d5c99933222.tar.gz |
qt5: upgrade to latest revisions in 5.7 branches
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 | 6 |
1 files changed, 3 insertions, 3 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..a6972fca 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,4 +1,4 @@ | |||
1 | From 90d2f7aefa8922c3aa29e6907c1520c814d1797f Mon Sep 17 00:00:00 2001 | 1 | From aab168c504038c7573f72e082a2431bc0502efd9 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 1/2] <chromium> base.gypi: include |
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | 12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi |
13 | index b860735..0ed5de3 100644 | 13 | index be4e87c..5434828 100644 |
14 | --- a/src/3rdparty/chromium/base/base.gypi | 14 | --- a/src/3rdparty/chromium/base/base.gypi |
15 | +++ b/src/3rdparty/chromium/base/base.gypi | 15 | +++ b/src/3rdparty/chromium/base/base.gypi |
16 | @@ -785,7 +785,7 @@ | 16 | @@ -787,7 +787,7 @@ |
17 | ['include', '^nix/'], | 17 | ['include', '^nix/'], |
18 | ], | 18 | ], |
19 | }], | 19 | }], |