16 files changed, 33 insertions, 36 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 976b3001..a793ab49 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 542b69b5534214e9d0ddb4ba328325d0bfcccb50 Mon Sep 17 00:00:00 2001
+From 4c54d7c45a47a9a63530e821468f7bc76dd78f77 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] Add linux-oe-g++ platform
@@ -31,7 +31,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 2830a1b1897..6445dc2d5a0 100755
+index 2830a1b189..6445dc2d5a 100755
 --- a/configure
 +++ b/configure
 @@ -712,7 +712,7 @@ fi
@@ -44,7 +44,7 @@ index 2830a1b1897..6445dc2d5a0 100755
  
  # build qmake
 diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index 934a18a9249..0f5b1b63334 100644
+index 934a18a924..0f5b1b6333 100644
 --- a/mkspecs/features/configure.prf
 +++ b/mkspecs/features/configure.prf
 @@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
@@ -65,7 +65,7 @@ index 934a18a9249..0f5b1b63334 100644
              msg = "test $$1 succeeded"
              write_file($$QMAKE_CONFIG_LOG, msg, append)
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index b57afcf72d7..afa1c39b3e9 100644
+index b57afcf72d..afa1c39b3e 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
 @@ -147,7 +147,7 @@ import_plugins:qtConfig(static) {
@@ -89,7 +89,7 @@ index b57afcf72d7..afa1c39b3e9 100644
      # run qmlimportscanner
      qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 1903e509c8e..c093dd4592d 100644
+index 1903e509c8..c093dd4592 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
 @@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -103,7 +103,7 @@ index 1903e509c8e..c093dd4592d 100644
              cmd = perl -w $$system_path($${cmd}.pl)
 diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
 new file mode 100644
-index 00000000000..d90dfeb4482
+index 0000000000..d90dfeb448
 --- /dev/null
 +++ b/mkspecs/linux-oe-g++/qmake.conf
 @@ -0,0 +1,40 @@
@@ -149,7 +149,7 @@ index 00000000000..d90dfeb4482
 +load(qt_config)
 diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
 new file mode 100644
-index 00000000000..5d22fb41013
+index 0000000000..5d22fb4101
 --- /dev/null
 +++ b/mkspecs/linux-oe-g++/qplatformdefs.h
 @@ -0,0 +1 @@
diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index 3a219c1f..477aa470 100644
--- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
+++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,4 +1,4 @@
-From 4941648d4b26d625e86273d992697129209d8256 Mon Sep 17 00:00:00 2001
+From 34692222faebb1345a1830c4f0d25adee10161ab 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] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 2450f7ef..c3ee8ee9 100644
--- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
-From 1fce658543816f654c6b4abcf02b6190189ba3b7 Mon Sep 17 00:00:00 2001
+From 74aefb4f9841ab99eea7d817babad4b01e44c6c8 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index 141923df..185f27f0 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
-From 0dbc0d39c274f35415122d0b4d001da50d8e5355 Mon Sep 17 00:00:00 2001
+From 40d61921f44c6f52a44f6efce0439a42f5186e1f 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
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index 0512ef0144..8a53223a4e 100644
+index 6e7f6b76a4..35d15685ee 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -817,10 +817,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -821,10 +821,10 @@ defineTest(qtConfOutput_preparePaths) {
          "static const char qt_configure_installation     [12+11]  = \"qt_instdate=2012-12-20\";" \
          "" \
          "/* Installation Info */" \
diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
index 24f966f5..c49a2fe8 100644
--- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
+++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
@@ -1,4 +1,4 @@
-From ffc59fc3f976db9008859857c2db1579b7784b57 Mon Sep 17 00:00:00 2001
+From 458e2b0192ec1b4b2add05aa7554302f598a9470 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 24 Oct 2016 09:45:18 +0300
 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index 1211129283..f2c5b3a5a4 100644
+index 4039bba431..153edbfa30 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -1265,7 +1265,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
+@@ -1266,7 +1266,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
                      error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
                  return($$result)
              }
diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
index 537ff3f6..eb1fddc7 100644
--- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
+++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -1,4 +1,4 @@
-From 78d36c322ca9d8d90a419b15febef4c11bf9066b Mon Sep 17 00:00:00 2001
+From 3450dba78d488d76cb4827ebfe0c8eda8d1517ca Mon Sep 17 00:00:00 2001
 From: Pascal Bach <pascal.bach@siemens.com>
 Date: Wed, 11 May 2016 15:20:41 +0200
 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
index 9b449d36..c4d1fd5b 100644
--- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
+++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
@@ -1,4 +1,4 @@
-From ee84c3b9cc8add6ee0c1a49c167b51f8d37230ae Mon Sep 17 00:00:00 2001
+From b4088245535393a75ebf6747acd281f6b9187e12 Mon Sep 17 00:00:00 2001
 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
 Date: Wed, 7 Jun 2017 21:00:49 +0900
 Subject: [PATCH] Delete qlonglong and qulonglong
diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 77b11a4b..3011f5f2 100644
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
-From ef85b182bc1f2f6a337c6946fdbf3b37ade936cb Mon Sep 17 00:00:00 2001
+From f3f00676d204b56010d80a1373ad18abe80d455a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
-index c6fd5d17c2..7bf6bfd0e6 100644
+index e312199980..5789174ad5 100644
 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 @@ -34,7 +34,7 @@
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
index 3aa0d2dd..c5586852 100644
--- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
+++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
@@ -1,4 +1,4 @@
-From 9a370262cce48a78b944a8d6e77257f915ab76e6 Mon Sep 17 00:00:00 2001
+From 563e954aaa4cf82560f157af79344c4b7cb7ca6d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 3 Sep 2017 09:11:44 -0700
 Subject: [PATCH] Add OE specific specs for clang compiler
diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
index 5b8a10d6..7dbce146 100644
--- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
+++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
@@ -1,4 +1,4 @@
-From c8840a63123e084cd5b2b3b8f10df72ed0ba2efb Mon Sep 17 00:00:00 2001
+From 7dff9f4506d9d0e3059d0016de748ea2074e19aa Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 3 Sep 2017 09:44:48 -0700
 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T
diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
index cc82877e..04e8a0a3 100644
--- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
+++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
@@ -1,4 +1,4 @@
-From 50c9fd7dc392ac4591c37bc3c97a6e48486e01b7 Mon Sep 17 00:00:00 2001
+From 5e108991e3f781026a71be241ba7d0c5b06ac655 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 3 Sep 2017 10:11:50 -0700
 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
-index 375cecd521..46ca9b11cc 100644
+index b7cb8a1bdc..f6e6545948 100644
 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
 +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
 @@ -46,7 +46,7 @@
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
index 1d6f3632..d636c633 100644
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
@@ -1,4 +1,4 @@
-From b41e0477f9b7aad73c94833dc750971a606871dc Mon Sep 17 00:00:00 2001
+From 18d57dc5c7946f06f087031be259b9b8922f4691 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 14 Feb 2018 17:08:43 -0800
 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
diff --git a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
index fcfb4e9e..bc7f0cb7 100644
--- a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
+++ b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
@@ -1,4 +1,4 @@
-From 1f9aefc7b4dee2f64ae64b72f7a20b139feb8440 Mon Sep 17 00:00:00 2001
+From 1f0101170508a11618ed444d3691cb5369daf7e5 Mon Sep 17 00:00:00 2001
 From: Ulf Hermann <ulf.hermann@qt.io>
 Date: Fri, 27 Apr 2018 10:38:18 +0200
 Subject: [PATCH] Upgrade double-conversion to v3.0.0
diff --git a/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
index e1e1087c..673e8fd9 100644
--- a/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
+++ b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
@@ -1,4 +1,4 @@
-From 7e287f4793f75a7291386a904d3361460748b15b Mon Sep 17 00:00:00 2001
+From 067dd79223c12e40930e612964a77066393a4131 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Tue, 21 Aug 2018 00:29:06 +0200
 Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped
@@ -11,14 +11,14 @@ Upstream-Status: Pending
 
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
- src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++
+ src/corelib/io/qfilesystemengine_unix.cpp | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
 diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
-index be6ce48d0cb..1bf1bebc7f1 100644
+index deb4a9f220..ecf23168e7 100644
 --- a/src/corelib/io/qfilesystemengine_unix.cpp
 +++ b/src/corelib/io/qfilesystemengine_unix.cpp
-@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory();
+@@ -97,6 +97,17 @@ extern "C" NSString *NSTemporaryDirectory();
  #  define FICLONE       _IOW(0x94, 9, int)
  #endif
  
@@ -36,6 +36,3 @@ index be6ce48d0cb..1bf1bebc7f1 100644
  #  if defined(Q_OS_ANDROID)
  // renameat2() and statx() are disabled on Android because quite a few systems
  // come with sandboxes that kill applications that make system calls outside a
--- 
-2.14.4
-
diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch
index 0a32e881..e021d0b1 100644
--- a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
-From 7ad41f69af974ec924eb27c86fb15d5da9384d6c Mon Sep 17 00:00:00 2001
+From e590966ce7344a79e6ff0593076fdca5b3ec72c8 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] Always build uic and qvkgen
@@ -14,10 +14,10 @@ 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 1f7c5d99c1..6b39379dd0 100644
+index 1c76a2e46f..fbd4014fb3 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -222,7 +222,7 @@ qtConfig(gui) {
+@@ -232,7 +232,7 @@ qtConfig(gui) {
          }
      }
  }
diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch
index 4f5fdc95..7c6787fb 100644
--- a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
-From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001
+From ee9048d24045e2f39a4236557d9247c1cad993a5 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 24 Nov 2017 15:16:31 +0200
 Subject: [PATCH] Bootstrap without linkat feature