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

* meta-qt5/master:
  qttransltations: Add PACKAGE for qtwebengine and qtquickcontrols2
  qtwebengine: Hide textrel QA warning until there is proper fix for it
  qtwebengine: Fix QA warning
  qtwebkit: Fix QA Warning
  examples: fix few thousands host-user-contaminated QA warnings
  qtbase: Don't install libQt* files twice
  qtbase: Resolve QA warning about /bin/bash dependency
  qtbase: Fix WORKDIR references in pkg-config files
  qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)
  qmake5_base: delete *.la files
  qt5: add Qml support to lupdate
  qt3d: support qgltf in native and nativesdk builds
  qt5: use common PACKAGECONFIG to build examples
  qt5-git.inc: Ensure we export the SRCREV as the module name
  qtbase: Fix installation of fonts and libraries

Conflicts:
	classes/qmake5_base.bbclass
	recipes-qt/qt5/nativesdk-qtbase_git.bb
	recipes-qt/qt5/qt3d_git.bb
	recipes-qt/qt5/qt5-git.inc
	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/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
	recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
	recipes-qt/qt5/qtbase_git.bb
	recipes-qt/qt5/qtcanvas3d_git.bb
	recipes-qt/qt5/qtconnectivity_git.bb
	recipes-qt/qt5/qtdeclarative_git.bb
	recipes-qt/qt5/qtenginio_git.bb
	recipes-qt/qt5/qtgraphicaleffects_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/qtquickcontrols_git.bb
	recipes-qt/qt5/qtscript_git.bb
	recipes-qt/qt5/qtsensors_git.bb
	recipes-qt/qt5/qtserialport_git.bb
	recipes-qt/qt5/qtsvg_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/qtwebchannel_git.bb
	recipes-qt/qt5/qtwebengine_git.bb
	recipes-qt/qt5/qtwebkit_git.bb
	recipes-qt/qt5/qtxmlpatterns_git.bb

Change-Id: I0a7763f973c32df796cb3e37c753ddbfe43c4521

1 files changed, 5 insertions, 5 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 f2dcaed2..dbc1e24e 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,7 +1,7 @@
-From ebfec8ca32379bffd18cbab1f4335a458fcc7e41 Mon Sep 17 00:00:00 2001
+From 5f6389fe3493420c2afeec8f2786165f1d08901a Mon Sep 17 00:00:00 2001
 From: Simon Busch <morphis@gravedo.de>
 Date: Tue, 18 Nov 2014 10:38:18 +0100
-Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to
+Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to
  generate it's moc'ed abbreviation
 
 Signed-off-by: Simon Busch <morphis@gravedo.de>
@@ -11,10 +11,10 @@ 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 2825457..f761b64 100644
+index 8d984c7..055e960 100644
 --- a/tools/qmake/mkspecs/features/functions.prf
 +++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -110,7 +110,8 @@ defineReplace(findIncludedMocFiles) {
+@@ -128,7 +128,8 @@ defineReplace(findIncludedMocFiles) {
  }
  
  defineReplace(mocOutput) {
@@ -25,5 +25,5 @@ index 2825457..f761b64 100644
    for(ext, $$list($${QMAKE_EXT_CPP})): \
        out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
 -- 
-2.6.2
+2.7.0