summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-02-27 21:38:28 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-02 11:22:24 +0100
commite088f366191f9a4cadc815c3d72d85086619a184 (patch)
treecf2d1b499c9b5c0cfd37fac76caca2c97c69381d /recipes-qt/qt5/qtwebengine
parent7d5d2d3f6969dcde88a24b43b101bca8df08e5c8 (diff)
downloadmeta-qt5-e088f366191f9a4cadc815c3d72d85086619a184.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')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch4
5 files changed, 13 insertions, 13 deletions
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 90202923..9aa061d0 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 @@
1From 0fdc77731963107902fba356b96a9f0648d03e81 Mon Sep 17 00:00:00 2001 1From 33fac625554652e137c9fb095425c25240ee83ae Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200 3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH 1/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
@@ -10,7 +10,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
11 11
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index 2df689b..8d984c7 100644 13index 2f7cd39..6ae413a 100644
14--- a/tools/qmake/mkspecs/features/functions.prf 14--- a/tools/qmake/mkspecs/features/functions.prf
15+++ b/tools/qmake/mkspecs/features/functions.prf 15+++ b/tools/qmake/mkspecs/features/functions.prf
16@@ -131,9 +131,9 @@ defineReplace(mocOutput) { 16@@ -131,9 +131,9 @@ defineReplace(mocOutput) {
@@ -26,5 +26,5 @@ index 2df689b..8d984c7 100644
26 } 26 }
27 27
28-- 28--
292.7.0 292.7.1
30 30
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 72eec1b2..3662c441 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 @@
1From 75b06098b5780ba3eaa24d48dd90d91590a379d1 Mon Sep 17 00:00:00 2001 1From 958e5875c25f76e7431c86286305f289effcedf6 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100 3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to 4Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
11 1 file changed, 2 insertions(+), 1 deletion(-) 11 1 file changed, 2 insertions(+), 1 deletion(-)
12 12
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 8d984c7..055e960 100644 14index 6ae413a..deaab83 100644
15--- a/tools/qmake/mkspecs/features/functions.prf 15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf 16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) { 17@@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) {
@@ -25,5 +25,5 @@ index 8d984c7..055e960 100644
25 for(ext, $$list($${QMAKE_EXT_CPP})): \ 25 for(ext, $$list($${QMAKE_EXT_CPP})): \
26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) 26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
27-- 27--
282.7.0 282.7.1
29 29
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 6bf29357..b3f83a39 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 @@
1From 52575f04d108183482cef6b4b871f736ef66aa1b Mon Sep 17 00:00:00 2001 1From 4c5dd531c728384326c0875661b77d2f9d0faf19 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform 4Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform
@@ -12,7 +12,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12 1 file changed, 6 insertions(+) 12 1 file changed, 6 insertions(+)
13 13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index 055e960..379c9b5 100644 15index deaab83..68cdb71 100644
16--- a/tools/qmake/mkspecs/features/functions.prf 16--- a/tools/qmake/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf 17+++ b/tools/qmake/mkspecs/features/functions.prf
18@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) { 18@@ -5,6 +5,12 @@ defineTest(isPlatformSupported) {
@@ -29,5 +29,5 @@ index 055e960..379c9b5 100644
29 winrt { 29 winrt {
30 skipBuild("WinRT is not supported.") 30 skipBuild("WinRT is not supported.")
31-- 31--
322.7.0 322.7.1
33 33
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 efaabf04..e4dcbebc 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 @@
1From b3c28efd16c9e9a0cd2a29441dae02382b8deaea Mon Sep 17 00:00:00 2001 1From 35afd225b448d2641594f2fd7e31c423cc64ecae Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -22,5 +22,5 @@ index e4313a4..5a8137e 100644
22 namespace QtWebEngineCore { 22 namespace QtWebEngineCore {
23 class WebContentsAdapter; 23 class WebContentsAdapter;
24-- 24--
252.7.0 252.7.1
26 26
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 b2cc4d14..dfd8e25c 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 @@
1From cc711a443c53c61475957fd8b6ffcf84272bf7a6 Mon Sep 17 00:00:00 2001 1From 1ad078e7cb9d8fff66f05e828953a2f5b11df7ee Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() 4Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate()
@@ -22,5 +22,5 @@ index b13a9da..8a54cce 100644
22 22
23 #include "base/callback.h" 23 #include "base/callback.h"
24-- 24--
252.7.0 252.7.1
26 26