diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 13:28:36 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 16:37:11 +0300 |
| commit | 7a2707393eccad021763cd9a4294e471883b8590 (patch) | |
| tree | 713154f6563edc827a610793baa5a33c6b088a53 /recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | |
| parent | 0fc7aeb1cbe2c63e24ce6ef06d290ac586133c2e (diff) | |
| parent | d9cd5ede502ddf04767d5531340b12050ee7f899 (diff) | |
| download | meta-qt5-7a2707393eccad021763cd9a4294e471883b8590.tar.gz | |
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master:
qtbase: fix drm dependency for eglfs PACKAGECONFIG
qt5: upgrade to latest revisions in 5.7 branch
qt5-opengles2-test: remove
cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
qtquick1: fix qtwebkit support
qtbase: add PACKAGECONFIG for journald logging
qtserialbus: add recipe
qtwayland: Rework recipe to allow PACKAGECONFIG use
qtwayland: add dependency on libxcomposite
qtcharts: Add dependency on qtmultimedia
packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS.
Conflicts:
classes/qmake5_base.bbclass
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick1_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsystems_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ia3d047984b6249526d6bf14373114d0fc734c458
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 0a708aff..d10ddf7f 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 @@ | |||
| 1 | From d084661f50dbdc6a4014f9a2181462bba770437f Mon Sep 17 00:00:00 2001 | 1 | From 6ed60f35761ab268004727be544e9ccf70594211 Mon Sep 17 00:00:00 2001 |
| 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> | 2 | From: Cleiton Bueno <cleitonrbueno@gmail.com> |
| 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 | 3 | Date: Fri, 25 Dec 2015 18:16:05 -0200 |
| 4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor | 4 | Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor |
| @@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> | |||
| 9 | 1 file changed, 2 insertions(+) | 9 | 1 file changed, 2 insertions(+) |
| 10 | 10 | ||
| 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h | 11 | diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h |
| 12 | index 892e99c..a4429d5 100644 | 12 | index f13bfd0..0e12244 100644 |
| 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h | 13 | --- a/src/webengine/api/qquickwebengineview_p_p.h |
| 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h | 14 | +++ b/src/webengine/api/qquickwebengineview_p_p.h |
| 15 | @@ -60,6 +60,8 @@ | 15 | @@ -60,6 +60,8 @@ |