diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-23 14:06:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 00:55:36 +0000 |
commit | 0cdf7276685ff03a769dc8201f60e8f16e04d879 (patch) | |
tree | e22ef17908656364aeb0f7a105adca604ebaec80 /recipes-qt/qt5/qtwebengine | |
parent | 9fc65c05f3296b606d4ceb6f4670f5f95eecc379 (diff) | |
download | meta-qt5-0cdf7276685ff03a769dc8201f60e8f16e04d879.tar.gz |
qt5: upgrade to 5.11.3
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
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 @@ | |||
1 | From 50a92a60b04d0e6253a903a53f5b01da2d00072d Mon Sep 17 00:00:00 2001 | ||
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | ||
3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | ||
4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor | ||
5 | |||
6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | ||
7 | --- | ||
8 | src/webengine/api/qquickwebengineview_p_p.h | 2 ++ | ||
9 | 1 file changed, 2 insertions(+) | ||
10 | |||
11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | ||
12 | index 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 @@ | |||
1 | From d61b28affb7d895e12dfa0e0390c488ec3b2a1f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | ||
3 | Date: Thu, 24 Dec 2015 15:59:51 -0200 | ||
4 | Subject: [PATCH] Include dependency to QCoreApplication::translate() | ||
5 | |||
6 | Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | ||
7 | --- | ||
8 | src/core/media_capture_devices_dispatcher.h | 2 ++ | ||
9 | 1 file changed, 2 insertions(+) | ||
10 | |||
11 | diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h | ||
12 | index 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" | ||