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-04-18 12:17:24 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-04-20 10:06:37 +0000
commit35f8981b11b4fcc7789f86fe2beed3f8841ee88d (patch)
tree61421f2456830dca3152b3dcdd2c370810c322a1 /recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
parent5bbfbca70586922b9b3f62878f46bc7260f42135 (diff)
downloadmeta-qt5-35f8981b11b4fcc7789f86fe2beed3f8841ee88d.tar.gz
qt5: upgrade to 5.11 beta3+
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 5f9c818d..1262ffe4 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 48fb6a724a72ee28987124e238051234b8c95431 Mon Sep 17 00:00:00 2001 1From 9f9eac8d12531fe6ec3aa77f719c0b8ca7cfdd75 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
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 5 insertions(+), 4 deletions(-) 14 2 files changed, 5 insertions(+), 4 deletions(-)
15 15
16diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 16diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
17index cc628ee..6b6aecc 100644 17index c6fd5d1..7bf6bfd 100644
18--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 18--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
19+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 19+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
20@@ -34,7 +34,7 @@ 20@@ -34,7 +34,7 @@
@@ -26,7 +26,7 @@ index cc628ee..6b6aecc 100644
26 #endif 26 #endif
27 27
28 #include <algorithm> 28 #include <algorithm>
29@@ -193,7 +193,7 @@ protected: 29@@ -205,7 +205,7 @@ protected:
30 const char *nm = name.constData(); 30 const char *nm = name.constData();
31 int tp = qRegisterMetaType<Bar>(nm); 31 int tp = qRegisterMetaType<Bar>(nm);
32 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) 32 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)