summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-10-18 11:06:26 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-10-31 13:41:46 +0200
commit2401cc3106e6f6e1d9c2a3016110cfa914a13dab (patch)
tree91ff16b8128511bfe449f54977c4fb3f3511647d /recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
parentf3213460a0495cac618d37bcbe59fddd58b6d65d (diff)
parente0db5666f9c04c92683514ca220b0aafd0a49df2 (diff)
downloadmeta-qt5-2401cc3106e6f6e1d9c2a3016110cfa914a13dab.tar.gz
Merge remote-tracking branch 'qtyocto/5.9' into 5.10
* qtyocto/5.9: qt5: update version to 5.9.3 qt5: remove use of OE_QMAKE_WAYLAND_SCANNER qtquickcontrols: remove duplicate FILES append qtdeclarative: remove upstreamed patch qt5: update qtx11extras revision for 5.9.2 qt5: update submodules qt5: update submodules Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9 qt5: add missing commercial license Fix compiling for qtenginio and qtquick1 Use correct HostPrefix qt5: update submodules qtwebview: remove obsolete patch qt5: update submodules qtwebengine: add patch for long paths qtwebengine: update 0004-Force-host-toolchain-configuration.patch qtwebengine: fix build with glibc-2.26 qt: upgrade to latest revision in 5.9 branch qt: refresh remaining patches and add links to meta-qt5 repos qtwebengine: add a fix for building demobrowser without printing support Upgrade to Qt 5.9.0 qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: disable gold to work around binutils bug qtwebengine: disable SECURITY_STRINGFORMAT to fix the build meta-toolchain-qt5: don't rely on COREBASE/LICENSE qtbase: fix Krogoth build regression from efa8aaf qt3d: refresh patches qtwebengine: refresh patches qtbase: refresh the patches qtwebengine: update to 5.9.2 qt5: bump version number to 5.9.2 qtbase: fix Krogoth build regression from efa8aaf gstreamer1.0-plugins-bad: add qt5 packageconfig qtbase: remove qtbase-native from DEPENDS qt3d: Fix build with clang qtwebkit: Backport a patch to fix build with icu-59 quazip: update to 0.7.3 and add missing metadata qtbase: Use sched_yield instead of pthread_yield qtbase: Fix ptests with clang qt5-ptest: fix build with yocto < 2.3 (pyro) qtbase: add ptest qwt-qt5.inc: fix QA warning qt5-git.inc: set CVE_PRODUCT to qt python-pyqt5: include QtWidgets module qt5-creator: Link with libexecinfo on musl qtvirtualkeyboard: Include sys/time.h qtwebengine: Fix build on musl qt5-creator: Fix build with NO_ACCESSIBILITY maliit-framework-qt5: Always have optimize flags qtbase-native: Fix qdbuscpp2xml segfault qt5-ptest.inc: append do_populate_sysroot only for target qtwebengine: fix build with gcc7 qwt-qt5: Fix rpath issues qtquickcontrols2: fix compilation of examples/texteditor qtquick1: add ptest qtdeclarative: add ptest qtxmlpatterns: add ptest qt5: add qt5-ptest.inc qtwebengine: add PACKAGECONFIG for webrtc libconnman-qt5: update to 1.1.10 Revert "qttools: DEPENDS on icu" qttools: DEPENDS on icu qtbase: respect "ld-is-gold" DISTRO_FEATURES Change-Id: I9dfcab3c94b62b22b68e66e8b13bdf4c570aada1
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
new file mode 100644
index 00000000..6ada3f94
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -0,0 +1,23 @@
1From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a 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 19ecf5e1..f6f638ee 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -59,6 +59,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;