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/qtwebengine | |
parent | 48ee17af942ac9860e834c8dec049370e7802a56 (diff) |
qt5: upgrade to latest revision in 5.4 branches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
4 files changed, 12 insertions, 12 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 b4a8852e..64670f0e 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 @@ -From 21d008c31a262ddcaeb3a8457de49061361ed882 Mon Sep 17 00:00:00 2001 +From 59e305219cdaeac6d143cb0466a2f518b4050688 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Fri, 3 Oct 2014 03:52:11 +0200 Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc @@ -6,7 +6,7 @@ Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - chromium/base/base.gypi | 2 +- + src/3rdparty/chromium/base/base.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi @@ -23,5 +23,5 @@ index a5a990a..af30cfa 100644 ['include', 'atomicops_internals_x86_gcc.cc'], ], -- -2.3.1 +2.4.2 diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch index 134133b3..447552e6 100644 --- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch +++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch @@ -1,7 +1,7 @@ -From b6ca6c086aa21985e17d11592a830f18159f1c3b Mon Sep 17 00:00:00 2001 +From 6e468c814087bac6ff88a1d7d02549e6cf8a152c Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 30 Jun 2014 20:08:17 +0200 -Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H +Subject: [PATCH 1/4] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H anywhere in path, but at the end Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> @@ -25,5 +25,5 @@ index 4c2547d..64c08ad 100644 } -- -2.3.5 +2.4.2 diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch index 8d1c5fd1..e7f4f7f0 100644 --- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch +++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch @@ -1,7 +1,7 @@ -From cfe706846298d41defbf0386f85b17e70108b7af Mon Sep 17 00:00:00 2001 +From 7a4a82af04fb228526dfd72a1d42b53b402952d1 Mon Sep 17 00:00:00 2001 From: Simon Busch <morphis@gravedo.de> Date: Tue, 18 Nov 2014 10:38:18 +0100 -Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to +Subject: [PATCH 2/4] functions.prf: Make sure we only use the file name to generate it's moc'ed abbreviation Signed-off-by: Simon Busch <morphis@gravedo.de> @@ -25,5 +25,5 @@ index 64c08ad..b46478b 100644 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) -- -2.3.5 +2.4.2 diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch index 4e5e4530..a932aefc 100644 --- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch @@ -1,7 +1,7 @@ -From 9595a2dd48dbf45ba1661cf1fd4d38fac8192a4f Mon Sep 17 00:00:00 2001 +From 87f1a22e6a1a6b40712eb131ba128d4f1e2da9b8 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf <frieder.schrempf@online.de> Date: Mon, 1 Dec 2014 14:34:40 +0000 -Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform +Subject: [PATCH 3/4] functions.prf: allow build for linux-oe-g++ platform Upstream-Status: Inappropriate [OE specific] @@ -25,5 +25,5 @@ index b46478b..6205bf4 100644 skipBuild("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation.") -- -2.3.5 +2.4.2 |