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

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

recipes-qt/qt5/nativesdk-qtbase_git.bb

@@ -5,13 +5,14 @@ HOMEPAGE = "http://qt-project.org"
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
+    file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
+    file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
     file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
+
 QT_MODULE = "qtbase"
 
 require nativesdk-qt5.inc
@@ -255,4 +256,4 @@ fakeroot do_generate_qt_environment_file() {
 
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
+SRCREV = "ac8a3b948da1980bc59bae3fc76d20b5b45662a0"

recipes-qt/qt5/qt5-git.inc

@@ -11,10 +11,4 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-PV = "5.5.99+5.6.0-alpha1+git${SRCPV}"
-
-#LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
-#LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-#                    file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
-#                    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-#                    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
+PV = "5.5.99+5.6.0-rc+git${SRCPV}"

recipes-qt/qt5/qtbase-native_git.bb

@@ -4,8 +4,8 @@ SECTION = "libs"
 HOMEPAGE = "http://qt-project.org"
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-    file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \
+    file://LICENSE.LGPLv21;md5=d3bb688e8d381a9fa5ee9063114b366d \
+    file://LICENSE.LGPLv3;md5=3fd06ee442011942b532cc6dedb0b39c \
     file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -117,4 +117,4 @@ do_install() {
     ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
 }
 
-SRCREV = "f7f4dde80e13ff1c05a9399297ffb746ab505e62"
+SRCREV = "ac8a3b948da1980bc59bae3fc76d20b5b45662a0"

recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch

@@ -1,7 +1,7 @@
-From 729b7873256b11778832c5786dc50fd9ea860a7d Mon Sep 17 00:00:00 2001
+From f35a940471022c31dfd72aa5d1c942ce64ca5a6a 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 1/9] Add linux-oe-g++ platform
+Subject: [PATCH 01/10] 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
@@ -56,7 +56,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 16e8fb4..9897fe6 100755
+index 1473a62..15207bf 100755
 --- a/configure
 +++ b/configure
 @@ -342,6 +342,16 @@ getQMakeConf()
@@ -124,7 +124,7 @@ index 16e8fb4..9897fe6 100755
  fi'`
      eval "$cmd"
  done
-@@ -3400,7 +3410,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+@@ -3418,7 +3428,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
      [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
  fi
 
@@ -133,7 +133,7 @@ index 16e8fb4..9897fe6 100755
 
  TEST_COMPILER=$QMAKE_CONF_COMPILER
 
-@@ -3457,7 +3467,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+@@ -3475,7 +3485,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
          exit 1
      fi
  fi
@@ -142,7 +142,7 @@ index 16e8fb4..9897fe6 100755
 
  GCC_MACHINE_DUMP=
  case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3958,6 +3968,14 @@ setBootstrapVariable()
+@@ -3976,6 +3986,14 @@ setBootstrapVariable()
      getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
  }
 
@@ -157,7 +157,7 @@ index 16e8fb4..9897fe6 100755
  # build qmake
  if true; then ###[ '!' -f "$outpath/bin/qmake" ];
      echo "Creating qmake..."
-@@ -3996,14 +4014,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4014,14 +4032,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
          fi
 
          [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -178,9 +178,9 @@ index 16e8fb4..9897fe6 100755
 +        setBootstrapEvalVariable QMAKE_LFLAGS
 +        setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS
 
-         if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
+         if [ "$CFG_RELEASE_TOOLS" = "yes" ]; then
              setBootstrapVariable QMAKE_CFLAGS_RELEASE
-@@ -4052,6 +4070,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4070,6 +4088,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
                          \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \
                          \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\""
              EXEEXT=
@@ -209,7 +209,7 @@ index 6b37a04..dcf6025 100644
              write_file($$QMAKE_CONFIG_LOG, msg, append)
 diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
 new file mode 100644
-index 0000000..d0a4166
+index 0000000..311ba04
 --- /dev/null
 +++ b/mkspecs/linux-oe-g++/qmake.conf
 @@ -0,0 +1,42 @@
@@ -362,5 +362,5 @@ index 0000000..dd12003
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.6.2
+2.7.1
 

recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch

@@ -1,8 +1,8 @@
-From f902b73eda6d459a3669fd78a3c8908ae13e705b Mon Sep 17 00:00:00 2001
+From 2fbde67aa4184e31ccbfae95e884b89567883904 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 2/9] qlibraryinfo: allow to set qt.conf from the outside using
- the environment
+Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
 
 Allow to set a qt.conf from the outside using the environment. This allows
 to inject new prefixes and other paths into qmake. This is needed when using
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 0cfcc4e..c3b5c2d 100644
+index 8bcacca..e1c87b5 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
 @@ -157,7 +157,10 @@ void QLibrarySettings::load()
@@ -35,5 +35,5 @@ index 0cfcc4e..c3b5c2d 100644
          return new QSettings(qtconfig, QSettings::IniFormat);
  #ifdef QT_BUILD_QMAKE
 -- 
-2.6.2
+2.7.1
 

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,26 +37,26 @@ 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=
 +QT_EXTERNAL_HOST_BINS=
 
  #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| \
 +    -external-hostbindir| \
      -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
 

recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch

@@ -1,7 +1,7 @@
-From a76a6c33be512a2909904b6136a6044e4b747ffd Mon Sep 17 00:00:00 2001
+From 43305bc5cfe1db5021abb1bf2806dcc63b31f176 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 4/9] qt_module: Fix pkgconfig and libtool replacements
+Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -63,8 +63,8 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
  mkspecs/features/qt_common.prf |  2 +-
- mkspecs/features/qt_module.prf | 10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
+ mkspecs/features/qt_module.prf | 11 +++++++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
 index 38602f6..f9c401f 100644
@@ -80,33 +80,27 @@ index 38602f6..f9c401f 100644
      lib_replace.CONFIG = path
      QMAKE_PRL_INSTALL_REPLACE += lib_replace
 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 193629b..38ff9a8 100644
+index e543ea6..0624ce2 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
-@@ -255,6 +255,11 @@ unix|mingw {
-     pclib_replace.CONFIG = path
-     QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
-
+@@ -273,6 +273,17 @@ load(qt_targets)
+         ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
+     ltlib_replace.CONFIG = path
+     QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
++
 +    pkgconfig_include_replace.match = $$rplbase/include
 +    pkgconfig_include_replace.replace = "\$$\\{includedir}"
 +    pkgconfig_include_replace.CONFIG = path
 +    QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
 +
-     unix {
-         CONFIG += create_libtool explicitlib
-         host_build: \
-@@ -266,6 +271,11 @@ unix|mingw {
-             ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
-         ltlib_replace.CONFIG = path
-         QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace
-+        # drop -L/usr/lib in .prl files
-+        prl_replace.match = "-L\$${libdir}"
-+        prl_replace.replace = ""
-+        prl_replace.CONFIG = path
-+        QMAKE_PRL_INSTALL_REPLACE += prl_replace
-     }
++    # drop -L/usr/lib in .prl files
++    prl_replace.match = "-L\$${libdir}"
++    prl_replace.replace = ""
++    prl_replace.CONFIG = path
++    QMAKE_PRL_INSTALL_REPLACE += prl_replace
  }
 
+ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
 -- 
-2.6.2
+2.7.0
 

recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch

@@ -1,7 +1,7 @@
-From 9f80241e140b0e22d58aa2ac6ef13a277c38fe9f Mon Sep 17 00:00:00 2001
+From 8bc8e96a6ad707c5f399c307e519444a1fafc4fe Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <denys@ti.com>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
-Subject: [PATCH 5/9] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 05/10] 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 aa89d30..6edfffd 100755
+index 8fafeca..34c7b8b 100755
 --- a/configure
 +++ b/configure
-@@ -3912,10 +3912,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+@@ -3930,10 +3930,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 */
@@ -32,5 +32,5 @@ index aa89d30..6edfffd 100755
 
  static const short qt_configure_str_offsets[] = {
 -- 
-2.6.2
+2.7.1