Merge remote-tracking branch 'qt/upstream/master' into 5.15

The updated pyqt5 recipe removed from build as it had incorrect
checksum & SRC_URI seems to be inaccessible (it is a snapshot build
that seems to get overwritten by the next build, meaning the
package version defined in pyqt5 recipe title is accessible only a
short while).

Vulkan PACKAGECONFIG already included in our layer, removed the duplicate
entry.

* upstream/master:
  1650757f python3-pyqt5: Update to 5.15 version
  e8a44772 ogl-runtime: update to v2.7.0
  098b9aca qt5-creator_git: add x11 and opengl to REQUIRED_DISTRO_FEATURES
  fbbd24d9 qtwayland: conditional to support PACKAGECONFIG wayland-egl
  62bb2ca6 qtbase: Add vulkan to PACKAGECONFIGs
  b4340317 qt5: upgrade to 5.15.0

Conflicts:
  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/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
  recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtcoap_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdatavis3d_git.bb
  recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtgamepad_git.bb
  recipes-qt/qt5/qtgraphicaleffects_git.bb
  recipes-qt/qt5/qtimageformats_git.bb
  recipes-qt/qt5/qtknx_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtlottie_git.bb
  recipes-qt/qt5/qtmqtt_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtnetworkauth_git.bb
  recipes-qt/qt5/qtopcua_git.bb
  recipes-qt/qt5/qtpurchasing_git.bb
  recipes-qt/qt5/qtquick3d_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtquicktimeline_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtscript_git.bb
  recipes-qt/qt5/qtscxml_git.bb
  recipes-qt/qt5/qtsensors_git.bb
  recipes-qt/qt5/qtserialbus_git.bb
  recipes-qt/qt5/qtserialport_git.bb
  recipes-qt/qt5/qtsvg_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qttranslations_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebchannel_git.bb
  recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebglplugin_git.bb
  recipes-qt/qt5/qtwebsockets_git.bb
  recipes-qt/qt5/qtwebview_git.bb
  recipes-qt/qt5/qtx11extras_git.bb
  recipes-qt/qt5/qtxmlpatterns_git.bb

Change-Id: I35e5db6b4f122290c2ff0c011d68636edde8e861

19 files changed, 39 insertions, 39 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 872212f6..a8d85346 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 45fbe12b5cff5825e078f731c2e8e3d294b9a1d2 Mon Sep 17 00:00:00 2001
+From 8442f94819458c79a88ad6177207c0e922a007bd 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,10 +31,10 @@ 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 6657870e4b..2f5d9a21ef 100755
+index b6c9b462f2..4e3fcd41d1 100755
 --- a/configure
 +++ b/configure
-@@ -711,7 +711,7 @@ fi
+@@ -708,7 +708,7 @@ fi
  # is where the resulting variable is written to
  setBootstrapVariable()
  {
@@ -65,7 +65,7 @@ index 934a18a924..0f5b1b6333 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 3a71376029..dd6020f1fe 100644
+index 99b7fe6562..1ddfddb2bd 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
 @@ -148,7 +148,7 @@ import_plugins:qtConfig(static) {
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 7cbe46ed..dbd527ac 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 f05a53357489590c3cd8cd848a34f3aeb4bebe18 Mon Sep 17 00:00:00 2001
+From 826dbd9eac2b99c25e3e97f210eec3eef90941da 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
@@ -72,7 +72,7 @@ index a814678f7b..8546e4b4dc 100644
      _qt5_DBus_check_file_exists(${imported_location})
  
 diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-index 236d1d4159..f25a73a78b 100644
+index 83d8004a08..d0651ee44b 100644
 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
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 3fb6bc87..78784935 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 ea0973fb18ca76d292b3c7fb7a29be547f6d95e1 Mon Sep 17 00:00:00 2001
+From 64518ca83c405b8666739909f0c9daba4928f070 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
@@ -20,7 +20,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 835fea0c77..dea00e28b9 100644
+index f1d7832e46..312fd2b0c8 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
 @@ -183,7 +183,10 @@ void QLibrarySettings::load()
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 3a223c2c..f91792c0 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 f83f21998ba43dcdb02de360ba9997f909c5d677 Mon Sep 17 00:00:00 2001
+From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c 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
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 e1536f40..703a3d9c 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 6e0bfe33f74f4a24d7f4c9adb5b96ca6ae844308 Mon Sep 17 00:00:00 2001
+From 018b5507d9f01db2d408aaecffb837d283e9e36a 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
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 b4f253e7..bfaca2b1 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 0a279228c6a3eb52e434aeb31504762dd29e2f5f Mon Sep 17 00:00:00 2001
+From 9ccf2216dae8288a31824dad570cf63443d0e66d 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
@@ -30,10 +30,10 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
  2 files changed, 10 insertions(+)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 4c3086a1f6..f330d28448 100644
+index 309798a767..d9a83cf6db 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
+@@ -2,6 +2,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
      message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
  endif()
  
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 a8161770..55c9ad78 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 bc9aa54b9930635ddceb918bfc94871e2fc3d413 Mon Sep 17 00:00:00 2001
+From 43394997b285f11450dc2c2b7184d730c2fba30b 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 1dbb2855..4353d43e 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 fbe7fd996b86c087d64864bcce154d382701ab6f Mon Sep 17 00:00:00 2001
+From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e 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
@@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644
              QMetaType info(tp);
              if (!info.isValid()) {
 diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
-index 099aa5fb51..c2d310458e 100644
+index 6dd390ccbd..43b92606d9 100644
 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 @@ -78,6 +78,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 f5e21333..632c1cc8 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 ed82988ac6aca8c6927211edefa4e548cc284dfd Mon Sep 17 00:00:00 2001
+From 7fb3964a19710834d4eb700c538015b8234af347 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 a0b882ca..5372ec3e 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 1d03a7f53ca07ffcee37ec2a6606435c18585ce7 Mon Sep 17 00:00:00 2001
+From df227467c195289a779f45a33be9dd32d1786ffe 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 f579cb5a..dfac71f7 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 146fcda8319f17e01af676ee4151d83f302c6d6e Mon Sep 17 00:00:00 2001
+From 5cdbde95e65bf641dda1a74711fd67b3237fb410 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/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
-index ec85a6c5c6..15bf7d106f 100644
+index 11ba032d82..027aef00fd 100644
 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
 +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
 @@ -46,7 +46,7 @@
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
index fa348096..4f4ed837 100644
--- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
+++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
-From bbf475d3c2415a78a8701bd3acaf69032721d597 Mon Sep 17 00:00:00 2001
+From be570ecd63da95a11428552723519393cc0cb53e Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 23 Oct 2018 09:54:57 +0300
 Subject: [PATCH] Disable ltcg for host_build
diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
index 59fd70b0..86148aee 100644
--- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
+++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
@@ -1,4 +1,4 @@
-From 44e4a803fd41ff975cdd6c90afa4be66396e14a4 Mon Sep 17 00:00:00 2001
+From 261a2abc536391dadd9e799c3ee32d31ab140d15 Mon Sep 17 00:00:00 2001
 From: Max Krummenacher <max.krummenacher@toradex.com>
 Date: Sat, 27 Oct 2018 12:29:31 +0000
 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
diff --git a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
index dbad9cf6..76e75ac8 100644
--- a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
+++ b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch
@@ -1,4 +1,4 @@
-From 54936e8ad2e9329edacc6e8150087d463c14fac4 Mon Sep 17 00:00:00 2001
+From c09fe6a87c444dc20b93334a9530d5bfd9ab03ff Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 6 Dec 2018 11:47:52 -0800
 Subject: [PATCH] corelib: Include sys/types.h for uint32_t
diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
index 138cbad3..2333b4a1 100644
--- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
+++ b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
@@ -1,4 +1,4 @@
-From d45c22d639c58d20a15ffc70c28a00e800c12bf4 Mon Sep 17 00:00:00 2001
+From a83f643bfea108dda725a7b0c7eb8c957004466f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 6 Dec 2018 15:06:20 -0800
 Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
index e9e29941..c032ec03 100644
--- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
+++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch
@@ -1,4 +1,4 @@
-From f2da5661a2a8bc2037a4d40fd1db16522af6d7a8 Mon Sep 17 00:00:00 2001
+From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001
 From: Nicola Lunghi <nick83ola@gmail.com>
 Date: Wed, 5 Feb 2020 15:32:25 +0000
 Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894
  1 file changed, 37 insertions(+), 13 deletions(-)
 
 diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-index 9eb62ceab2..211151876c 100644
+index 45798cc527..de3f156cae 100644
 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
 +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-@@ -2893,19 +2893,43 @@ void tst_QPainter::monoImages()
+@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages()
  #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
  #include <fenv.h>
  
@@ -67,7 +67,7 @@ index 9eb62ceab2..211151876c 100644
          return QLatin1String("Invalid operation");
      return QLatin1String("No exception");
  }
-@@ -2931,7 +2955,7 @@ private:
+@@ -2932,7 +2956,7 @@ private:
  
  void fpe_rasterizeLine_task232012()
  {
@@ -76,7 +76,7 @@ index 9eb62ceab2..211151876c 100644
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
      img.fill(0x0);
      QPainter p(&img);
-@@ -2943,7 +2967,7 @@ void fpe_rasterizeLine_task232012()
+@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012()
  
  void fpe_pixmapTransform()
  {
@@ -85,7 +85,7 @@ index 9eb62ceab2..211151876c 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -2971,7 +2995,7 @@ void fpe_pixmapTransform()
+@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform()
  
  void fpe_zeroLengthLines()
  {
@@ -94,7 +94,7 @@ index 9eb62ceab2..211151876c 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -2983,7 +3007,7 @@ void fpe_zeroLengthLines()
+@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines()
  
  void fpe_divByZero()
  {
@@ -103,7 +103,7 @@ index 9eb62ceab2..211151876c 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -3006,7 +3030,7 @@ void fpe_divByZero()
+@@ -3007,7 +3031,7 @@ void fpe_divByZero()
  
  void fpe_steepSlopes()
  {
@@ -112,7 +112,7 @@ index 9eb62ceab2..211151876c 100644
  
      QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
  
-@@ -3025,7 +3049,7 @@ void fpe_steepSlopes()
+@@ -3026,7 +3050,7 @@ void fpe_steepSlopes()
  
  void fpe_radialGradients()
  {
diff --git a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
index 5d5a32d7..8a112ced 100644
--- a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
-From ecfccd0a25564555253f9f09fa6bed85973020a4 Mon Sep 17 00:00:00 2001
+From 6a7c34194c6bbb53c2b13375db3cb2d6a9aabe31 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 592f0cf644..e1cfc3901f 100644
+index 6658cbc9e0..d4a0e68e8d 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -235,7 +235,7 @@ qtConfig(gui) {
+@@ -242,7 +242,7 @@ qtConfig(gui) {
          }
      }
  }
diff --git a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch
index aba0d502..f8699cfd 100644
--- a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch
+++ b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch
@@ -1,4 +1,4 @@
-From f2324ba65bb667108a8ad2f08bc4e4b08253e38b Mon Sep 17 00:00:00 2001
+From db1700a72d62f7b8686f94cf262d96171c298f5f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 14 Apr 2019 13:27:58 +0200
 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
@@ -46,7 +46,7 @@ index b3daf43c04..e1df2ac580 100644
  # define QT_FEATURE_statx -1
  #endif
 diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
-index eaf4e2d9af..63f2f8ecb3 100644
+index 67cff7c68c..86e45320d5 100644
 --- a/src/corelib/io/qfilesystemengine_unix.cpp
 +++ b/src/corelib/io/qfilesystemengine_unix.cpp
 @@ -1435,16 +1435,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
index 68193991..a8169a69 100644
--- a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
-From 6d2382ba56e9d2362ff3572356911f3ef1d6eaef Mon Sep 17 00:00:00 2001
+From 0422ea8555c7d42e2e3091e1f5ee9fe172b6a89f 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