2 files changed, 26 insertions, 60 deletions
diff --git a/recipes-qt/qt5/qtbase/0008-QBuffer-add-missing-limits-include.patch b/recipes-qt/qt5/qtbase/0008-QBuffer-add-missing-limits-include.patch
new file mode 100644
index 00000000..03eea8c0
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0008-QBuffer-add-missing-limits-include.patch
@@ -0,0 +1,26 @@
+From 58e05c3f9b5c6b3f15ab559c6f93e94d8e1fb360 Mon Sep 17 00:00:00 2001
+From: Marc Mutz <marc.mutz@qt.io>
+Date: Wed, 4 May 2022 11:36:48 +0200
+Subject: [PATCH] QBuffer: add missing <limits> include
+
+Amends 4bc85b9850303fa20206f8774af88d72593d3454.
+
+Pick-to: 6.3 6.2 5.15
+Change-Id: If826043f01155f9854cc69079a09f1b50b47994c
+---
+ src/corelib/io/qbuffer.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp
+index c485bc28f5..7ebc9c9bb6 100644
+--- a/src/corelib/io/qbuffer.cpp
++++ b/src/corelib/io/qbuffer.cpp
+@@ -41,6 +41,8 @@
+ #include <QtCore/qmetaobject.h>
+ #include "private/qiodevice_p.h"
+ 
++#include <limits>
++
+ QT_BEGIN_NAMESPACE
+ 
+ /** QBufferPrivate **/
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
deleted file mode 100644
index b338170e..00000000
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2bb8b79b41eed87b843eb0159d6fa21a92c4c152 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
-
-On Linux pthead_yield is same as sched_yield implementation wise
-and sched_yield is available on all libc
-implementations on Linux
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp   | 4 ++--
- tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 5 +++--
- 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 19b3289390..4d0cdf8b5f 100644
---- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
-+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
-@@ -35,7 +35,7 @@
- #include "tst_qvariant_common.h"
- 
- #ifdef Q_OS_LINUX
--# include <pthread.h>
-+# include <sched.h>
- #endif
- 
- #include <algorithm>
-@@ -369,7 +369,7 @@ protected:
-             const char *nm = name.constData();
-             int tp = qRegisterMetaType<Bar>(nm);
- #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
--            pthread_yield();
-+            sched_yield();
- #endif
-             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 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 @@
- #include <stdlib.h>
- #include <sys/stat.h>
- #include <unistd.h>
-+#include <sched.h>
- #endif
- 
- #include <memory>
-@@ -2200,8 +2201,8 @@ public slots:
- 
- #if defined(Q_OS_MAC)
-         pthread_yield_np();
--#elif defined Q_OS_LINUX && !defined Q_OS_ANDROID
--        pthread_yield();
-+#elif defined Q_OS_LINUX
-+        sched_yield();
- #endif
-         if (!sock->waitForConnected()) {
-             networkTimeout = true;