Merge remote-tracking branch 'meta-qt5/master' into master-mingw

* meta-qt5/master:
  replace base_contains by bb.utils.contains
  qt5: upgrade to latest revision in 5.6 branch
  qt5: set SRCREVs,PVs to 5.6.0
  qtquickcontrols: fix compilation of examples/texteditor
  qtdeclarative: fix compilation of examples/qquickviewcomparison
  quazip: update to 0.7.2
  qtquickcontrols2: initial add 5.6.0
  qmake5_base: use remove-libtool bbclass
  recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF

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/0010-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/qtenginio_git.bb
	recipes-qt/qt5/qtlocation_git.bb
	recipes-qt/qt5/qtmultimedia_git.bb
	recipes-qt/qt5/qtquick1_git.bb
	recipes-qt/qt5/qtquickcontrols_git.bb
	recipes-qt/qt5/qtsvg_git.bb
	recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
	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/qtwebkit_git.bb
	recipes-qt/qt5/qtwebsockets_git.bb
	recipes-qt/qt5/qtxmlpatterns_git.bb

Change-Id: I703197bf7b3802fa22d48a7c9eb04cfa25657c9f

1 files changed, 2 insertions, 5 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
index 28960ed4..78cb3fc4 100644
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
-From 348a74cb924cf6ac4384069d84ee3995644b2ce1 Mon Sep 17 00:00:00 2001
+From f4c64fbabdcc30d46d9181401aa1c9d78fcb0b2f Mon Sep 17 00:00:00 2001
 From: Frieder Schrempf <frieder.schrempf@online.de>
 Date: Mon, 1 Dec 2014 14:34:40 +0000
-Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform
+Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
 
 Upstream-Status: Inappropriate [OE specific]
 
@@ -28,6 +28,3 @@ index 055e960..379c9b5 100644
    } else:win32 {
      winrt {
        skipBuild("WinRT is not supported.")
--- 
-2.7.0
-