6 files changed, 20 insertions, 139 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 a8d85346..37e0a6a9 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 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001
+From c97da220d95091386724e1eadc360ed16ed52dfe 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
@@ -65,10 +65,10 @@ 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 99b7fe6562..1ddfddb2bd 100644
+index 69d1954306..37f7c9c4a2 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) {
+@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) {
              plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
              plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
              isEmpty(plug_path): \
@@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644
              LIBS += $$plug_path/$$plug_type/$$plug_name
          } else {
              LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-@@ -271,8 +271,8 @@ for(ever) {
+@@ -274,8 +274,8 @@ for(ever) {
  # static builds: link qml import plugins into the target.
  contains(all_qt_module_deps, qml): \
          qtConfig(static):import_plugins:!host_build:!no_import_scan {
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 f91792c0..751e59d7 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 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001
+From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc 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 e775bf046e..a20eded987 100644
+index 49755f7abf..f84862d1ca 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) {
  
      $${currentConfig}.output.qconfigSource = \
          "/* Installation Info */" \
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 4353d43e..08a79898 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 c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001
+From 18904a169397f343e75bee5f29fa9ae1444a295f 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 6dd390ccbd..43b92606d9 100644
+index e397e80fe0..cdb7893e56 100644
 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 @@ -78,6 +78,7 @@
@@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644
 +#include <sched.h>
  #endif
  
- #include "private/qhostinfo_p.h"
-@@ -2199,8 +2200,8 @@ public slots:
+ #include <memory>
+@@ -2200,8 +2201,8 @@ public slots:
  
  #if defined(Q_OS_MAC)
          pthread_yield_np();
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
deleted file mode 100644
index 147e304d..00000000
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 47d2068fa96173b68bcbc45a80a66d7c9cbf4775 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
-
--isystem fails to build when code uses include_next on certain files e.g.
-
-qtbase/5.10.0+gitAUTOINC+50117d738a-r0/recipe-sysroot/usr/include/c++/7.3.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory
- #include_next <stdlib.h>
-               ^~~~~~~~~~
-compilation terminated.
-make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1
-
-Upstream-Status: Pending
-
-Change-Id: Ia47832a6339a6ee59c0a6301fc5e552cd28b1029
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/common/clang.conf    | 2 +-
- mkspecs/common/gcc-base.conf | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
-index 2499c8b6d8..2e79e083cd 100644
---- a/mkspecs/common/clang.conf
-+++ b/mkspecs/common/clang.conf
-@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT    = .pch
- 
- QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
- 
--QMAKE_CFLAGS_ISYSTEM             = -isystem
-+QMAKE_CFLAGS_ISYSTEM             =
- QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_LTCG                = -flto=thin
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index 1f919d270a..adf3fead32 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG         += -g
- QMAKE_CFLAGS_SHLIB         += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_STATIC_LIB    += $$QMAKE_CFLAGS_PIC
- QMAKE_CFLAGS_APP           += $$QMAKE_CFLAGS_PIC
--QMAKE_CFLAGS_ISYSTEM        = -isystem
-+QMAKE_CFLAGS_ISYSTEM        =
- QMAKE_CFLAGS_YACC          += -Wno-unused -Wno-parentheses
- QMAKE_CFLAGS_HIDESYMS      += -fvisibility=hidden
- QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
diff --git a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
deleted file mode 100644
index 341be6ad..00000000
--- a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8e9c933cad3bd044b432b5557cf47a9ffea4e318 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Nov 2019 08:27:39 -0800
-Subject: [PATCH] input: Make use of timeval portable for 64bit time_t
-
-This patch avoids using time field of input_event structure which is not available
-on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
-and keeps old input.h implementation functional as well.
-
-See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
-Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610]
-Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845
----
- .../input/evdevkeyboard/qevdevkeyboardhandler.cpp      | 10 +++++++++-
- .../input/evdevtouch/qevdevtouchhandler.cpp            |  7 ++++++-
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-index 3555763b89..e7dc57c027 100644
---- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
-@@ -58,6 +58,11 @@
- #include <linux/input.h>
- #endif
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- QT_BEGIN_NAMESPACE
- 
- Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
-@@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state)
-     qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
- 
-     struct ::input_event led_ie;
--    ::gettimeofday(&led_ie.time, 0);
-+    struct timeval tval;
-+    ::gettimeofday(&tval, 0);
-+    led_ie.input_event_sec = tval.tv_sec;
-+    led_ie.input_event_usec = tval.tv_usec;
-     led_ie.type = EV_LED;
-     led_ie.code = led;
-     led_ie.value = state;
-diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-index 78728ef4ce..1d65f9b9f7 100644
---- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-@@ -58,6 +58,11 @@
- #include <linux/input.h>
- #endif
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- #include <math.h>
- 
- #if QT_CONFIG(mtdev)
-@@ -573,7 +578,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data)
- 
-         // update timestamps
-         m_lastTimeStamp = m_timeStamp;
--        m_timeStamp = data->time.tv_sec + data->time.tv_usec / 1000000.0;
-+        m_timeStamp = data->input_event_sec + data->input_event_usec / 1000000.0;
- 
-         m_lastTouchPoints = m_touchPoints;
-         m_touchPoints.clear();
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 c032ec03..69063457 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 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001
+From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 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 45798cc527..de3f156cae 100644
+index 42e98ce363..0ca9b87f04 100644
 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
 +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages()
+@@ -2931,19 +2931,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 45798cc527..de3f156cae 100644
          return QLatin1String("Invalid operation");
      return QLatin1String("No exception");
  }
-@@ -2932,7 +2956,7 @@ private:
+@@ -2969,7 +2993,7 @@ private:
  
  void fpe_rasterizeLine_task232012()
  {
@@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
      img.fill(0x0);
      QPainter p(&img);
-@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012()
+@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012()
  
  void fpe_pixmapTransform()
  {
@@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform()
+@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform()
  
  void fpe_zeroLengthLines()
  {
@@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines()
+@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines()
  
  void fpe_divByZero()
  {
@@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
  
-@@ -3007,7 +3031,7 @@ void fpe_divByZero()
+@@ -3044,7 +3068,7 @@ void fpe_divByZero()
  
  void fpe_steepSlopes()
  {
@@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644
  
      QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
  
-@@ -3026,7 +3050,7 @@ void fpe_steepSlopes()
+@@ -3063,7 +3087,7 @@ void fpe_steepSlopes()
  
  void fpe_radialGradients()
  {