From 754aaadc7f0a1c98a4895899617afbaef0f1cdfa Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 20 Apr 2016 11:38:06 +0200 Subject: 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 --- ...04-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch') 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..901462cd 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,7 +1,7 @@ -From 80f5e26073ef58c1a2ff510c6ccdb7423bcb2fc3 Mon Sep 17 00:00:00 2001 +From a2670f5ad67822b399e9dd7b3b87589be1da9749 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 +Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor Signed-off-by: Cleiton Bueno --- @@ -9,7 +9,7 @@ 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 65bf25e..0447d07 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -56,6 +56,8 @@ @@ -21,6 +21,3 @@ index dbbbf91..94268b6 100644 namespace QtWebEngineCore { class WebContentsAdapter; --- -2.7.0 - -- cgit v1.2.3-54-g00ecf