From f87ed4bdc60f38a42efdd6a418eb1d5c99933222 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 14 Feb 2016 18:37:41 +0100 Subject: qt5: upgrade to latest revisions in 5.7 branches Signed-off-by: Martin Jansa --- .../0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | 6 +++--- .../0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 2 +- .../0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch | 2 +- .../0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch | 2 +- .../0003-functions.prf-allow-build-for-linux-oe-g-platform.patch | 2 +- .../0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | 6 +++--- .../0005-Include-dependency-to-QCoreApplication-translate.patch | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine') 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 @@ -From 90d2f7aefa8922c3aa29e6907c1520c814d1797f Mon Sep 17 00:00:00 2001 +From aab168c504038c7573f72e082a2431bc0502efd9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 3 Oct 2014 03:52:11 +0200 Subject: [PATCH 1/2] base.gypi: include @@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi -index b860735..0ed5de3 100644 +index be4e87c..5434828 100644 --- a/src/3rdparty/chromium/base/base.gypi +++ b/src/3rdparty/chromium/base/base.gypi -@@ -785,7 +785,7 @@ +@@ -787,7 +787,7 @@ ['include', '^nix/'], ], }], 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 88d4826e..90202923 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,4 +1,4 @@ -From f052458fe39733602751f9f9a09d1c0d78bea421 Mon Sep 17 00:00:00 2001 +From 0fdc77731963107902fba356b96a9f0648d03e81 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 30 Jun 2014 20:08:17 +0200 Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch index 1227d0a0..94eaf86a 100644 --- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch @@ -1,4 +1,4 @@ -From a015bddaf2005cac376be7dda4603637afc5844c Mon Sep 17 00:00:00 2001 +From c3805244c812f4dbfb8949dc2f146aa5c7af62df Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Thu, 24 Dec 2015 12:46:58 -0200 Subject: [PATCH 2/2] chromium: Change false to FALSE and 1 to TRUE, FIX 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 dbc1e24e..72eec1b2 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,4 +1,4 @@ -From 5f6389fe3493420c2afeec8f2786165f1d08901a Mon Sep 17 00:00:00 2001 +From 75b06098b5780ba3eaa24d48dd90d91590a379d1 Mon Sep 17 00:00:00 2001 From: Simon Busch Date: Tue, 18 Nov 2014 10:38:18 +0100 Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to 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 28960ed4..6bf29357 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,4 +1,4 @@ -From 348a74cb924cf6ac4384069d84ee3995644b2ce1 Mon Sep 17 00:00:00 2001 +From 52575f04d108183482cef6b4b871f736ef66aa1b Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Mon, 1 Dec 2014 14:34:40 +0000 Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch index 4a3deb9b..efaabf04 100644 --- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch @@ -1,4 +1,4 @@ -From 80f5e26073ef58c1a2ff510c6ccdb7423bcb2fc3 Mon Sep 17 00:00:00 2001 +From b3c28efd16c9e9a0cd2a29441dae02382b8deaea Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Fri, 25 Dec 2015 18:16:05 -0200 Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor @@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno 1 file changed, 2 insertions(+) diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h -index dbbbf91..94268b6 100644 +index e4313a4..5a8137e 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h -@@ -56,6 +56,8 @@ +@@ -59,6 +59,8 @@ #include #include #include diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch index 6fd9e499..b2cc4d14 100644 --- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch @@ -1,4 +1,4 @@ -From b3f3154e4852a830fdc4e311d4f5105fc337e8f2 Mon Sep 17 00:00:00 2001 +From cc711a443c53c61475957fd8b6ffcf84272bf7a6 Mon Sep 17 00:00:00 2001 From: Cleiton Bueno Date: Thu, 24 Dec 2015 15:59:51 -0200 Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() @@ -9,10 +9,10 @@ Signed-off-by: Cleiton Bueno 1 file changed, 2 insertions(+) diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h -index 500fe76..eda2824 100644 +index b13a9da..8a54cce 100644 --- a/src/core/media_capture_devices_dispatcher.h +++ b/src/core/media_capture_devices_dispatcher.h -@@ -43,6 +43,8 @@ +@@ -46,6 +46,8 @@ #include #include -- cgit v1.2.3-54-g00ecf