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

1 files changed, 6 insertions, 4 deletions

diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 92f3160f..21c9aa38 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -5,8 +5,8 @@ LICENSE = "LGPL-3.0 & BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0"
 LIC_FILES_CHKSUM = " \
     file://src/core/browser_context_qt.cpp;md5=b5193b7d68699260f3b40b201365c8d2;beginline=1;endline=38 \
     file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
-    file://LICENSE.LGPL3;md5=3dcffeed712d3c916f9a2d9135703aff \
-    file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
+    file://LICENSE.LGPL3;md5=8211fde12cc8a4e2477602f5953f5b71 \
+    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -122,8 +122,10 @@ SRC_URI += " \
     file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
 "
 
-SRCREV_qtwebengine = "023168cf91dc7ac11ced1b6a60ca7aa248987810"
-SRCREV_chromium = "46f522d613bb77600ed3a85580ff84ee9802e21b"
+SRCREV_qtwebengine = "dbf7dd27428ff755444eac5e975cb69802ac9771"
+# This is in git submodule, but we're using the latest in 49-based
+# SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878"
+SRCREV_chromium = "29c16917b33c26ad32893fa05af971c6c6f50297"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"