summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-10-25 12:44:03 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-11-05 15:43:26 +0000
commit5a604b0dec61ce4a9a14fc32b64c56afa703934e (patch)
tree7afdba29f0b3ef07a83352a1b91017e4e1dd6266 /recipes-qt/qt5/qtwebengine
parentf54526a31b240fc65193509686c38387570b45de (diff)
downloadmeta-qt5-5a604b0dec61ce4a9a14fc32b64c56afa703934e.tar.gz
qt5: update submodules
Update to Qt 5.12.0 Beta4 * Removed old qtwebengine patches, seemingly fixed upstream long time ago in commits fd247c68523c35b93a72b2046d3fd8367d391ce8 and bae703a3f53126a8baac5ef957662e62ce00344a (QTBUG-52460) Task-number: QTBUG-70847 Change-Id: If9037e1aab33a01e3a88645e826223e54a00d5bc Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch23
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch23
2 files changed, 0 insertions, 46 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
deleted file mode 100644
index d0e9679f..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 50a92a60b04d0e6253a903a53f5b01da2d00072d Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7---
8 src/webengine/api/qquickwebengineview_p_p.h | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index 1723da7e..4d9e5981 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -61,6 +61,8 @@
16 #include <QString>
17 #include <QtCore/qcompilerdetection.h>
18 #include <QtGui/qaccessibleobject.h>
19+#include <QColor>
20+
21
22 namespace QtWebEngineCore {
23 class WebContentsAdapter;
diff --git a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch
deleted file mode 100644
index 0467d97a..00000000
--- a/recipes-qt/qt5/qtwebengine/0002-Include-dependency-to-QCoreApplication-translate.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From d61b28affb7d895e12dfa0e0390c488ec3b2a1f8 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate()
5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7---
8 src/core/media_capture_devices_dispatcher.h | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
12index 579d159a..0904c468 100644
13--- a/src/core/media_capture_devices_dispatcher.h
14+++ b/src/core/media_capture_devices_dispatcher.h
15@@ -45,6 +45,8 @@
16 #include <list>
17 #include <map>
18
19+#include <QCoreApplication>
20+
21 #include "web_contents_adapter_client.h"
22
23 #include "base/callback.h"