qt5: upgrade to latest revision in 5.5 branches

* qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream

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

14 files changed, 58 insertions, 130 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 568d2a40..e67df401 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,4 +1,4 @@
-From de9a457dacd9388e8ef145fce9cf4e1e1da6468b Mon Sep 17 00:00:00 2001
+From 566de5f3f4dc14bae25a1b77eb6859c820447a32 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
@@ -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 8a4c89e..dfbb111 100755
+index cea62fb..e1929e7 100755
 --- a/configure
 +++ b/configure
 @@ -342,6 +342,16 @@ getQMakeConf()
@@ -120,7 +120,7 @@ index 8a4c89e..dfbb111 100755
  fi'`
      eval "$cmd"
  done
-@@ -3337,7 +3347,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+@@ -3350,7 +3360,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
      [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
  fi
  
@@ -129,7 +129,7 @@ index 8a4c89e..dfbb111 100755
  
  TEST_COMPILER=$QMAKE_CONF_COMPILER
  
-@@ -3394,7 +3404,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+@@ -3407,7 +3417,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
          exit 1
      fi
  fi
@@ -138,7 +138,7 @@ index 8a4c89e..dfbb111 100755
  
  GCC_MACHINE_DUMP=
  case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3896,6 +3906,14 @@ setBootstrapVariable()
+@@ -3909,6 +3919,14 @@ setBootstrapVariable()
      getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
  }
  
@@ -153,7 +153,7 @@ index 8a4c89e..dfbb111 100755
  # build qmake
  if true; then ###[ '!' -f "$outpath/bin/qmake" ];
      echo "Creating qmake..."
-@@ -3934,14 +3952,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3947,14 +3965,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
          fi
  
          [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -348,5 +348,5 @@ index 0000000..dd12003
 +
 +#endif // QPLATFORMDEFS_H
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 57275176..800d42a8 100644
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
-From 7ca620bb9f03ddc8536ac3c45b485cc83603f1c8 Mon Sep 17 00:00:00 2001
+From 9e987abf08c5841fcce3331aceec51e00a26dcc8 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH 02/10] qlibraryinfo: allow to set qt.conf from the outside
@@ -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 2912e68..f663c88 100644
+index 0cfcc4e..c3b5c2d 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 2912e68..f663c88 100644
          return new QSettings(qtconfig, QSettings::IniFormat);
  #ifdef QT_BUILD_QMAKE
 -- 
-2.5.0
+2.5.3
 
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 c44611d5..de8e1a4d 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
-From 0ac23b38794bd4580428e11b2cf1c88eb7f410f3 Mon Sep 17 00:00:00 2001
+From 90f3f8f59dd23f67e14c9988c2f4449a31762752 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 03/10] Add -external-hostbindir option
@@ -37,10 +37,10 @@ Conflicts:
  7 files changed, 37 insertions(+), 12 deletions(-)
 
 diff --git a/configure b/configure
-index dfbb111..548dd0d 100755
+index e1929e7..a757ce5 100755
 --- a/configure
 +++ b/configure
-@@ -806,6 +806,7 @@ QT_HOST_BINS=
+@@ -809,6 +809,7 @@ QT_HOST_BINS=
  QT_HOST_LIBS=
  QT_HOST_DATA=
  QT_EXT_PREFIX=
@@ -48,7 +48,7 @@ index dfbb111..548dd0d 100755
  
  #flags for SQL drivers
  QT_CFLAGS_PSQL=
-@@ -925,6 +926,7 @@ while [ "$#" -gt 0 ]; do
+@@ -928,6 +929,7 @@ while [ "$#" -gt 0 ]; do
      -testsdir| \
      -hostdatadir| \
      -hostbindir| \
@@ -56,7 +56,7 @@ index dfbb111..548dd0d 100755
      -hostlibdir| \
      -extprefix| \
      -sysroot| \
-@@ -1154,6 +1156,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1157,6 +1159,9 @@ while [ "$#" -gt 0 ]; do
      extprefix)
          QT_EXT_PREFIX="$VAL"
          ;;
@@ -66,7 +66,7 @@ index dfbb111..548dd0d 100755
      pkg-config)
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_PKGCONFIG="$VAL"
-@@ -2380,6 +2385,10 @@ Installation options:
+@@ -2383,6 +2388,10 @@ Installation options:
      -hostdatadir <dir> . Data used by qmake will be installed to <dir>
                           (default HOSTPREFIX)
  
@@ -77,7 +77,7 @@ index dfbb111..548dd0d 100755
  Configure options:
  
   The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -3097,6 +3106,11 @@ fi
+@@ -3110,6 +3119,11 @@ fi
  # command line and environment validation
  #-------------------------------------------------------------------------------
  
@@ -225,5 +225,5 @@ index 99d87e2..5621dc0 100644
      _qt5_Widgets_check_file_exists(${imported_location})
  
 -- 
-2.5.0
+2.5.3
 
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 aef49995..e7155bb8 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,4 +1,4 @@
-From bae1b8fbd3fe94a99a02fb751302baa788e9f2ff Mon Sep 17 00:00:00 2001
+From d28d15f9489ab9bb09627014003ad1bde2a79e1f 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
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index 5861941..474827c 100644
+index 55f65b5..2412fdd 100644
 --- a/mkspecs/features/qt_common.prf
 +++ b/mkspecs/features/qt_common.prf
 @@ -36,7 +36,7 @@ contains(TEMPLATE, .*lib) {
@@ -80,7 +80,7 @@ index 5861941..474827c 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 5412f37..5ab348a 100644
+index c89b6d2..23d4366 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
 @@ -214,6 +214,11 @@ unix|mingw {
@@ -108,5 +108,5 @@ index 5412f37..5ab348a 100644
  }
  
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index fbddae3b..0875bd88 100644
--- a/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,4 +1,4 @@
-From 0b4d9044218df6e7fb700be6cfd21b4aaab24b18 Mon Sep 17 00:00:00 2001
+From c3f540be8541f71fdb7b7baa9000583a914ac7f7 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 19 Mar 2014 18:32:28 +0100
 Subject: [PATCH 05/10] qeglplatformintegration: Undefine CursorShape from X.h
@@ -26,5 +26,5 @@ index 42fbf8c..8950f2d 100644
  
  class QEGLPlatformWindow;
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch
index 8f95480c..0635a2f5 100644
--- a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
-From fe6405c5a628c168e42138ac82ba70bb8c909d0b Mon Sep 17 00:00:00 2001
+From 37aec78ac44bad8754c3bd5b56836025e4eed50a Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <denys@ti.com>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
-Subject: [PATCH] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 06/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 22867a7..fe18487 100755
+index a757ce5..f0f42ab 100755
 --- a/configure
 +++ b/configure
-@@ -3851,10 +3851,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+@@ -3863,10 +3863,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 22867a7..fe18487 100755
  
  static const short qt_configure_str_offsets[] = {
 -- 
-2.2.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch
index eb2fd5a8..e2d21155 100644
--- a/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0007-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,4 +1,4 @@
-From 7dfc673d6968ce890e5fad7fd8fd8a74c12b876b Mon Sep 17 00:00:00 2001
+From ca3b8fabcc38a9545e935a7c530565689fb85ff7 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 07/10] QOpenGLPaintDevice sub-area support
@@ -153,5 +153,5 @@ index c179143..fad68d5 100644
      } else {
          if (m_vao.isCreated()) {
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch
index 59266f48..d84e298b 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0008-Always-build-uic.patch
@@ -1,7 +1,7 @@
-From c6a58549ef110a31960fca80f6d3dcdcf4d9176a Mon Sep 17 00:00:00 2001
+From d1feb6d0a80460e66872749d931cddc8ed22851d 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/11] Always build uic
+Subject: [PATCH 08/10] 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 b4d62aa..5e19215 100644
+index 61e5ce2..a4047aa 100644
 --- a/src/src.pro
 +++ b/src/src.pro
 @@ -182,7 +182,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
@@ -27,5 +27,5 @@ index b4d62aa..5e19215 100644
  nacl: SUBDIRS -= src_network src_testlib
  
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch b/recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch
deleted file mode 100644
index 6583e80a..00000000
--- a/recipes-qt/qt5/qtbase/0008-Fix-build-with-clang-3.7.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 63111eaec5cb758d99d68a4e9ec827b79121544b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 23 Aug 2015 15:19:41 -0700
-Subject: [PATCH 08/10] Fix build with clang 3.7
-
-Nullable is a language extension in clang 3.7 (indicating whether or
-not a pointer can be null).
-http://clang.llvm.org/docs/AttributeReference.html#nullable
-Using it as a class name breaks building with this compiler
-
-Upstream-Status: Backport
-This is backport of https://codereview.qt-project.org/#/c/121545/
-
-/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:241:1: error: declaration of anonymous
-      struct must be a definition
-struct _Nullable: public std::unary_function<Name, bool>
-^
-/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:241:56: error: expected unqualified-id
-struct _Nullable: public std::unary_function<Name, bool>
-                                                       ^
-/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:303:98: error: expected expression
-          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
-                                                                                                 ^
-/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/armv7at2hf-vfp-neon-angstrom-linux-gnueabi/qtbase/5.4.2+gitAUTOINC+2cb17c1fb9-r0/git/src/tools/qlalr/lalr.cpp:638:107: error: expected expression
-                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
-                                                                                                          ^
-4 errors generated.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/tools/qlalr/lalr.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
-index 3d0d5de..3d780cd 100644
---- a/src/tools/qlalr/lalr.cpp
-+++ b/src/tools/qlalr/lalr.cpp
-@@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar ()
-   non_terminals.insert (accept_symbol);
- }
- 
--struct _Nullable: public std::unary_function<Name, bool>
-+struct Nullable: public std::unary_function<Name, bool>
- {
-   Automaton *_M_automaton;
- 
--  _Nullable (Automaton *aut):
-+  Nullable (Automaton *aut):
-     _M_automaton (aut) {}
- 
-   bool operator () (Name name) const
-@@ -300,7 +300,7 @@ void Automaton::buildNullables ()
- 
-       for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
-         {
--          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
-+          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (Nullable (this)));
- 
-           if (nn == rule->rhs.end ())
-             changed |= nullables.insert (rule->lhs).second;
-@@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph ()
-                   if (! _M_grammar->isNonTerminal (*A))
-                     continue;
- 
--                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
-+                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (Nullable (this)));
-                   if (first_not_nullable != rule->rhs.end ())
-                     continue;
- 
--- 
-2.5.0
-
diff --git a/recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 85213271..9bc13157 100644
--- a/recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ b/recipes-qt/qt5/qtbase/0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -1,7 +1,7 @@
-From 744fc89cd56387cac613534adc538900ed133b25 Mon Sep 17 00:00:00 2001
+From dcc588b11abdc12b4ed08534334e338f35d96ed1 Mon Sep 17 00:00:00 2001
 From: Michael Krelin <hacker@klever.net>
 Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 09/10] qmake: don't build it in configure, but allow to build
+Subject: [PATCH 08/10] qmake: don't build it in configure, but allow to build
  it separately
 
 * it is already built in qtbase-native, so we don't need it in configure
@@ -25,10 +25,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  3 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index b8f1fb9..c72b8ee 100755
+index f0f42ab..6f338f3 100755
 --- a/configure
 +++ b/configure
-@@ -3929,7 +3929,7 @@ setBootstrapEvalVariable()
+@@ -3942,7 +3942,7 @@ setBootstrapEvalVariable()
  
  
  # build qmake
@@ -64,5 +64,5 @@ index 89d6ea5..0ff4a96 100644
  VPATH += \
      ../src/corelib/global \
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch
index 4e770ee4..292ced81 100644
--- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
+++ b/recipes-qt/qt5/qtbase/0009-Add-external-hostbindir-option-for-native-sdk.patch
@@ -1,7 +1,7 @@
-From b0ab57e1f0781b73830514ddc498f38da0886d15 Mon Sep 17 00:00:00 2001
+From 22c6746515470bab482b8cbb9a256033470d3647 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 10/11] Add -external-hostbindir option for native(sdk)
+Subject: [PATCH 09/10] Add -external-hostbindir option for native(sdk)
 
 * 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:
  5 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/configure b/configure
-index b8f1fb9..1d2157f 100755
+index f0f42ab..04fd1ba 100755
 --- a/configure
 +++ b/configure
-@@ -3833,6 +3833,7 @@ addConfStr "$CFG_SYSROOT"
+@@ -3846,6 +3846,7 @@ addConfStr "$CFG_SYSROOT"
  addConfStr "$QT_REL_HOST_BINS"
  addConfStr "$QT_REL_HOST_LIBS"
  addConfStr "$QT_REL_HOST_DATA"
@@ -61,7 +61,7 @@ index 817ae95..c69539f 100644
      { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
  };
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index f663c88..675bd4c 100644
+index c3b5c2d..1381658 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
 @@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild()
@@ -130,5 +130,5 @@ index 3bf0546..53bf146 100644
      addConfStr(1, hostSpec);
  
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
index 0069a170..760f446c 100644
--- a/recipes-qt/qt5/qtbase/0010-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
+++ b/recipes-qt/qt5/qtbase/0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
@@ -1,7 +1,7 @@
-From bae2c6afb951d1352845ca257fdc2389f3fe851e Mon Sep 17 00:00:00 2001
+From b0648c997d24855b2a6f56fc61e3159af815fb4d 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 10/10] linux-oe-g++: Invert conditional for defining
+Subject: [PATCH 09/10] linux-oe-g++: Invert conditional for defining
  QT_SOCKLEN_T
 
 This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
@@ -32,5 +32,5 @@ index dd12003..8623651 100644
  
  #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch
index 1bfe8255..9a8ddbbf 100644
--- a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase/0010-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,7 +1,7 @@
-From cef1ac9fa399ad5c57480de26a1ef441414f125c Mon Sep 17 00:00:00 2001
+From 706d9a8b270d5eb803e93005cc90a1aa1553572a Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <denys@ti.com>
 Date: Mon, 11 Nov 2013 20:22:34 -0500
-Subject: [PATCH 11/11] configure: preserve built qmake and swap with native
+Subject: [PATCH 10/10] configure: preserve built qmake and swap with native
  one
 
 Let configure script build the real qmake, but right after it's built, swap
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/configure b/configure
-index 1d2157f..bea14af 100755
+index 04fd1ba..8914e9c 100755
 --- a/configure
 +++ b/configure
-@@ -4099,6 +4099,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4112,6 +4112,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
          echo "Done."
      fi
  fi # Build qmake
@@ -26,5 +26,5 @@ index 1d2157f..bea14af 100755
  echo "Running configuration tests..."
  
 -- 
-2.5.0
+2.5.3
 
diff --git a/recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch b/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
index a1a8791e..b2dbbfd7 100644
--- a/recipes-qt/qt5/qtbase/0012-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
+++ b/recipes-qt/qt5/qtbase/0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch
@@ -1,8 +1,8 @@
-From f8873b5ba0fa42cc0d2aadfd6c5a449b37799609 Mon Sep 17 00:00:00 2001
+From c09e6ef0bf6a879455ffee496c716a0bc1787cdf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
 Date: Sat, 12 Sep 2015 12:58:46 +0200
-Subject: [PATCH] qeglplatformscreen.cpp: reorder headers to fix build with egl
- enabled
+Subject: [PATCH 10/10] qeglplatformscreen.cpp: reorder headers to fix build
+ with egl enabled
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -45,5 +45,5 @@ index 61f8cdd..ceec797 100644
  
  QT_BEGIN_NAMESPACE
 -- 
-2.1.0
+2.5.3