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, 2 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
index 38e97d19..e487c6a5 100644
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -1,4 +1,4 @@
-From 9f314e95248795bcce787f88bce77ba6058b34c7 Mon Sep 17 00:00:00 2001
+From aa5bb11072bc0e441dc6533f53ed5359c5000088 Mon Sep 17 00:00:00 2001
 From: Simon Busch <morphis@gravedo.de>
 Date: Tue, 18 Nov 2014 10:38:18 +0100
 Subject: [PATCH] functions.prf: Make sure we only use the file name to
@@ -11,7 +11,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 277bf98..d263be4 100644
+index 7aa0b4a..9b3a639 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
 @@ -165,7 +165,8 @@ defineReplace(findIncludedMocFiles) {