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

* meta-qt5/master:
  qtwebkit: add PACKAGECONFIGs for libxcomposite, libxrender, fontconfig
  qtbase: remove fonts packages
  qtbase: Remove unsupported options xvideo, xinerama, xinput, gtkstyle
  qt5: upgrade to latest revisions in 5.7 branches
  qt5: add one more subfolder for ${PN}-qmldesigner
  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
  qtwebengine: enable ARMv7VE support
  Add .gitignore to ignore .pyc/.pyo files

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/0001-Add-linux-oe-g-platform.patch
	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/0005-configure-bump-path-length-from-256-to-512-character.patch
	recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
	recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
	recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
	recipes-qt/qt5/qtbase/0009-Always-build-uic.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/0001-qmltestexample-fix-link.patch
	recipes-qt/qt5/qtdeclarative_git.bb
	recipes-qt/qt5/qtgraphicaleffects_git.bb
	recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
	recipes-qt/qt5/qtimageformats_git.bb
	recipes-qt/qt5/qtlocation_git.bb
	recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
	recipes-qt/qt5/qtmultimedia_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/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
	recipes-qt/qt5/qtsvg_git.bb
	recipes-qt/qt5/qtsystems_git.bb
	recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
	recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
	recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
	recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
	recipes-qt/qt5/qttools_git.bb
	recipes-qt/qt5/qtwayland-native_git.bb
	recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
	recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
	recipes-qt/qt5/qtwayland_git.bb
	recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
	recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
	recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
	recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
	recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
	recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
	recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
	recipes-qt/qt5/qtwebengine_git.bb
	recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
	recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
	recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
	recipes-qt/qt5/qtwebkit_git.bb
	recipes-qt/qt5/qtwebsockets_git.bb
	recipes-qt/qt5/qtxmlpatterns_git.bb

Change-Id: Ifab26e8f8a0c8cb8af94509f657161de09c182d7

7 files changed, 30 insertions, 52 deletions

diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 284e0226..04e8739c 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
-From 516355ecd8ee54a8960c87c5f044b069221fa815 Mon Sep 17 00:00:00 2001
+From 79f881eaa0a4a980963ce4ea1bc4c5e26c640c9a Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/10] Add linux-oe-g++ platform
+Subject: [PATCH] Add linux-oe-g++ platform
 
 * This qmake.conf unlike other platforms reads most variables from
   shell environment, because it's easier for qt recipes to export
@@ -52,7 +52,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
 diff --git a/configure b/configure
-index 69d0a08..a53638a 100755
+index b65c564..ffe6931 100755
 --- a/configure
 +++ b/configure
 @@ -339,6 +339,16 @@ getQMakeConf()
@@ -120,7 +120,7 @@ index 69d0a08..a53638a 100755
  fi'`
      eval "$cmd"
  done
-@@ -3430,7 +3440,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+@@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
      [ "$CFG_GTK" = "auto" ] && CFG_GTK=no
  fi
  
@@ -129,7 +129,7 @@ index 69d0a08..a53638a 100755
  
  TEST_COMPILER=$QMAKE_CONF_COMPILER
  
-@@ -3481,7 +3491,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
+@@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
      fi
  fi
  
@@ -138,7 +138,7 @@ index 69d0a08..a53638a 100755
  
  GCC_MACHINE_DUMP=
  case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3880,6 +3890,14 @@ setBootstrapVariable()
+@@ -3878,6 +3888,14 @@ setBootstrapVariable()
      getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
  }
  
@@ -153,7 +153,7 @@ index 69d0a08..a53638a 100755
  # build qmake
  if true; then ###[ '!' -f "$outpath/bin/qmake" ];
      echo "Creating qmake..."
-@@ -3979,6 +3997,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
              EXEEXT=
              ;;
          esac
@@ -336,6 +336,3 @@ index 0000000..dd12003
 +#endif
 +
 +#endif // QPLATFORMDEFS_H
--- 
-2.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 81112b12..b3677eb0 100644
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,7 +1,7 @@
-From 884e27ee424299e2e8270cfa6d9b22fa57243eaf Mon Sep 17 00:00:00 2001
+From ac2f94a42878c1500e1ab6bbbec7834d9e5edfbb Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements
+Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
  2 files changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 4b40451..d486881 100644
+index 03ec36a..2ab192b 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) {
+@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) {
      QTPLUGIN = $$manualplugs $$autoplugs
  }
  
@@ -92,7 +92,7 @@ index 4b40451..d486881 100644
  contains(QT_CONFIG, static) {
      QT_PLUGIN_VERIFY += QTPLUGIN
 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index 0730084..333bb97 100644
+index c1c668a..67d916d 100644
 --- a/mkspecs/features/qt_common.prf
 +++ b/mkspecs/features/qt_common.prf
 @@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) {
@@ -104,6 +104,3 @@ index 0730084..333bb97 100644
      }
      lib_replace.CONFIG = path
      QMAKE_PRL_INSTALL_REPLACE += lib_replace
--- 
-2.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
index a67fe063..404c0686 100644
--- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
-From 795d1907fa683a35f8d09cb1a3ba2b3abc269e7e Mon Sep 17 00:00:00 2001
+From d108da324156b9d709c106c1698bd7466cb26f69 Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <denys@ti.com>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
-Subject: [PATCH 05/10] configure: bump path length from 256 to 512 characters
+Subject: [PATCH] configure: bump path length from 256 to 512 characters
 
 Increase the path length that gets hardcoded into generated config.cpp file
 from 256 to 512 characters, as nativesdk path can be quite long.
@@ -14,10 +14,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure b/configure
-index 440d09d..147d907 100755
+index 5aa87b4..17bca95 100755
 --- a/configure
 +++ b/configure
-@@ -3834,10 +3834,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+@@ -3832,10 +3832,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
  static const char qt_configure_installation          [12+11]    = "qt_instdate=2012-12-20";
  
  /* Installation Info */
@@ -31,6 +31,3 @@ index 440d09d..147d907 100755
  #endif
  
  static const short qt_configure_str_offsets[] = {
--- 
-2.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
index 8a27e697..92ecb133 100644
--- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
-From e4750b168337002678650ecf9fefaaa56fce0038 Mon Sep 17 00:00:00 2001
+From 17450df40d6c163c85b66c1cc485317fd6f9a9c9 Mon Sep 17 00:00:00 2001
 From: Jani Hautakangas <jani.hautakangas@ixonos.com>
 Date: Thu, 16 May 2013 09:52:07 +0300
-Subject: [PATCH 06/10] QOpenGLPaintDevice sub-area support
+Subject: [PATCH] QOpenGLPaintDevice sub-area support
 
 Allows creating QOpenGLPaintDevice targetting sub-area
 of binded framebuffer.
@@ -152,6 +152,3 @@ index 8f69095..cf82ee7 100644
          pex->updateClipScissorTest();
      } else {
          if (m_vao.isCreated()) {
--- 
-2.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
index 6e4d920a..4cc8ce6d 100644
--- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
+++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
@@ -1,8 +1,7 @@
-From c9593918f444274c6ea248229277f5b44dbae557 Mon Sep 17 00:00:00 2001
+From edb00662de57d0b6ddb39f80800cf3d20c6c07fd Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 8 Jun 2015 13:59:25 -0700
-Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining
- QT_SOCKLEN_T
+Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
 
 This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
 only when its glibc < 2 and not also for the libraries which may define
@@ -31,6 +30,3 @@ index dd12003..8623651 100644
  #endif
  
  #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
--- 
-2.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
index d029e415..106486f3 100644
--- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
+++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
@@ -1,7 +1,7 @@
-From 85beb0cf48cdbe99ec153bceeb964431560182e6 Mon Sep 17 00:00:00 2001
+From e1bc7a14ae9e433112006b1b6944f8b0e3f619ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Fri, 13 Nov 2015 12:36:11 +0100
-Subject: [PATCH 08/10] configure paths for target qmake properly
+Subject: [PATCH] configure paths for target qmake properly
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 147d907..a80f3f7 100755
+index 17bca95..6abdd6b 100755
 --- a/configure
 +++ b/configure
-@@ -3779,8 +3779,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
+@@ -3777,8 +3777,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
      QMAKE_CONFIG="$QMAKE_CONFIG compile_examples"
  fi
  
@@ -38,7 +38,7 @@ index 147d907..a80f3f7 100755
  
  QT_CONFIGURE_STR_OFF=0
  
-@@ -3813,7 +3818,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
+@@ -3811,7 +3816,11 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
  
  QT_CONFIGURE_STR_OFFSETS=
  QT_CONFIGURE_STRS=
@@ -51,7 +51,7 @@ index 147d907..a80f3f7 100755
  addConfStr "$QT_REL_HOST_BINS"
  addConfStr "$QT_REL_HOST_LIBS"
  addConfStr "$QT_REL_HOST_DATA"
-@@ -3825,6 +3834,12 @@ addConfStr "$shortspec"
+@@ -3823,6 +3832,12 @@ addConfStr "$shortspec"
  #-------------------------------------------------------------------------------
  [ -d "$outpath/src/corelib/global" ] || mkdir -p "$outpath/src/corelib/global"
  
@@ -64,7 +64,7 @@ index 147d907..a80f3f7 100755
  cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
  /* License Info */
  static const char qt_configure_licensee_str          [256 + 12] = "qt_lcnsuser=$Licensee";
-@@ -3837,7 +3852,7 @@ static const char qt_configure_installation          [12+11]    = "qt_instdate=2
+@@ -3835,7 +3850,7 @@ static const char qt_configure_installation          [12+11]    = "qt_instdate=2
  static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
  #ifdef QT_BUILD_QMAKE
  static const char qt_configure_ext_prefix_path_str   [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
@@ -73,6 +73,3 @@ index 147d907..a80f3f7 100755
  #endif
  
  static const short qt_configure_str_offsets[] = {
--- 
-2.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 3a1614f5..bee10d55 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,7 +1,7 @@
-From acd673711f3b32e714226ea563d8d7f0afff7251 Mon Sep 17 00:00:00 2001
+From 14b037afc3fa6992733891205a46b44991402afb Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
-Subject: [PATCH 09/10] Always build uic
+Subject: [PATCH] Always build uic
 
 Even if we are not building gui or widgets. This tool is needed later
 as a native tool when compiling the target.
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/src.pro b/src/src.pro
-index 1671338..83de483 100644
+index 4a165a2..0f84791 100644
 --- a/src/src.pro
 +++ b/src/src.pro
 @@ -180,7 +180,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
@@ -26,6 +26,3 @@ index 1671338..83de483 100644
  
  nacl: SUBDIRS -= src_network src_testlib
  
--- 
-2.7.1
-