summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-02-22 14:15:12 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-02-26 16:53:07 +0000
commit1d9fbb1576846318e6f842006bf8c27758f094fb (patch)
tree772f2b404ce6bb3c7c06bd381ccc72aa3efa741e /recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
parenta5aadb7a92558ea33833a189cc6b6fd1019c2a5b (diff)
downloadmeta-qt5-1d9fbb1576846318e6f842006bf8c27758f094fb.tar.gz
qt5: refresh patches from meta-qt5/qt* repos
* apply: 0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch also for nativesdk-qtbase as the comment says * drop unused: 0001-Add-missing-include-for-struct-timeval.patch which wasn't removed in 5.10.1 upgrade Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch6
1 files changed, 3 insertions, 3 deletions
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 cda88de6..81269d2e 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 @@
1From 25717f64a1cc8ec236372230d65895f21f3301a8 Mon Sep 17 00:00:00 2001 1From d79fecb4e8d2040efdc295d06c5e24bdf3cf6b60 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 27 Jul 2017 08:02:51 -0700 3Date: Thu, 27 Jul 2017 08:02:51 -0700
4Subject: [PATCH] Replace pthread_yield with sched_yield 4Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -36,7 +36,7 @@ index 076610a..cb8431f 100644
36 QMetaType info(tp); 36 QMetaType info(tp);
37 if (!info.isValid()) { 37 if (!info.isValid()) {
38diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 38diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
39index d7c8c8c..d4a2407 100644 39index e45eda2..e64f329 100644
40--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 40--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
41+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp 41+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
42@@ -78,6 +78,7 @@ 42@@ -78,6 +78,7 @@
@@ -47,7 +47,7 @@ index d7c8c8c..d4a2407 100644
47 #endif 47 #endif
48 48
49 #include "private/qhostinfo_p.h" 49 #include "private/qhostinfo_p.h"
50@@ -2129,8 +2130,8 @@ public slots: 50@@ -2136,8 +2137,8 @@ public slots:
51 51
52 #if defined(Q_OS_MAC) 52 #if defined(Q_OS_MAC)
53 pthread_yield_np(); 53 pthread_yield_np();