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

0 files changed, 0 insertions, 0 deletions