qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index ea152790..0cb8363f 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
-From 175d86ddb36117c0ca2ff47ae42693980dbfa098 Mon Sep 17 00:00:00 2001
+From b28148fd6ee59d584e59a07736da63ee9ea5c1ad Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 3/9] Add -external-hostbindir option
+Subject: [PATCH 03/10] Add -external-hostbindir option
 
 * when cross-compiling it's sometimes useful to use existing tools from machine
   (or in OpenEmbedded built with separate native recipe) when building for target
@@ -37,10 +37,10 @@ Conflicts:
  7 files changed, 38 insertions(+), 12 deletions(-)
 
 diff --git a/configure b/configure
-index 9897fe6..aa89d30 100755
+index 15207bf..8fafeca 100755
 --- a/configure
 +++ b/configure
-@@ -808,6 +808,7 @@ QT_HOST_BINS=
+@@ -810,6 +810,7 @@ QT_HOST_BINS=
  QT_HOST_LIBS=
  QT_HOST_DATA=
  QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index 9897fe6..aa89d30 100755
  
  #flags for SQL drivers
  QT_CFLAGS_PSQL=
-@@ -927,6 +928,7 @@ while [ "$#" -gt 0 ]; do
+@@ -929,6 +930,7 @@ while [ "$#" -gt 0 ]; do
      -testsdir| \
      -hostdatadir| \
      -hostbindir| \
@@ -56,7 +56,7 @@ index 9897fe6..aa89d30 100755
      -hostlibdir| \
      -extprefix| \
      -sysroot| \
-@@ -1157,6 +1159,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1159,6 +1161,9 @@ while [ "$#" -gt 0 ]; do
      extprefix)
          QT_EXT_PREFIX="$VAL"
          ;;
@@ -66,7 +66,7 @@ index 9897fe6..aa89d30 100755
      pkg-config)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_PKGCONFIG="$VAL"
-@@ -2419,6 +2424,10 @@ Installation options:
+@@ -2428,6 +2433,10 @@ Installation options:
      -hostdatadir <dir> . Data used by qmake will be installed to <dir>
                           (default HOSTPREFIX)
  
@@ -77,7 +77,7 @@ index 9897fe6..aa89d30 100755
  Configure options:
  
   The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -3158,6 +3167,11 @@ fi
+@@ -3172,6 +3181,11 @@ fi
  # command line and environment validation
  #-------------------------------------------------------------------------------
  
@@ -90,7 +90,7 @@ index 9897fe6..aa89d30 100755
  CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
  case "$CFG_QCONFIG" in
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 6616aa4..3d40bf9 100644
+index b2c2507..fba4a58 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
 @@ -57,7 +57,11 @@ defineTest(qtHaveModule) {
@@ -107,7 +107,7 @@ index 6616aa4..3d40bf9 100644
              cmd = perl -w $$system_path($${cmd}.pl)
          } else: contains(QMAKE_HOST.os, Windows) {
 diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
-index 3f0301a..7dc66de 100644
+index 839c3d6..45934a0 100644
 --- a/mkspecs/features/qt_tool.prf
 +++ b/mkspecs/features/qt_tool.prf
 @@ -14,10 +14,11 @@ load(qt_app)
@@ -125,7 +125,7 @@ index 3f0301a..7dc66de 100644
  
      !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
 diff --git a/qtbase.pro b/qtbase.pro
-index 24d0f52..d3d79b3 100644
+index 98ca86a..0eed475 100644
 --- a/qtbase.pro
 +++ b/qtbase.pro
 @@ -37,12 +37,16 @@ CONFIG -= qt
@@ -148,7 +148,7 @@ index 24d0f52..d3d79b3 100644
  }
  INSTALLS += qmake
  
-@@ -54,6 +58,9 @@ licheck.files = $$PWD/bin/$$QT_LICHECK
+@@ -59,6 +63,9 @@ INSTALLS += fixqt4headers
  #syncqt
  syncqt.path = $$[QT_HOST_BINS]
  syncqt.files = $$PWD/bin/syncqt.pl
@@ -159,7 +159,7 @@ index 24d0f52..d3d79b3 100644
  
  # If we are doing a prefix build, create a "module" pri which enables
 diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 65fd1f9..457518b 100644
+index 91a4eb6..25df27c 100644
 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
 +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644
      _qt5_Widgets_check_file_exists(${imported_location})
  
 -- 
-2.6.2
+2.7.1