summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-05 13:34:20 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-05 13:48:51 +0000
commitdde9b55a24a364c5fede0d6c874890acb0251386 (patch)
tree29aede243473f043fa6630431f827a575c4a8f7b /recipes-qt/qt5/qtbase
parente0a4e23c1dbeed88962694263de1776b530f3899 (diff)
downloadmeta-qt5-dde9b55a24a364c5fede0d6c874890acb0251386.tar.gz
qt5: refresh the patches and update them on meta-qt5 repositories
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch16
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch8
9 files changed, 30 insertions, 30 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 dbb0b9dc..c2a0d04d 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 @@
1From 6a84c4a36742716b5db715c2538901f37ff8b1c5 Mon Sep 17 00:00:00 2001 1From 0152f09dc119c93cc92bc2bb9de38c64fb0a854e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -21,16 +21,16 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
22--- 22---
23 configure | 2 +- 23 configure | 2 +-
24 mkspecs/features/configure.prf | 4 ++-- 24 mkspecs/features/configure.prf | 4 +--
25 mkspecs/features/qt_functions.prf | 2 +- 25 mkspecs/features/qt_functions.prf | 2 +-
26 mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++++++++++ 26 mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++
27 mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 27 mkspecs/linux-oe-g++/qplatformdefs.h | 1 +
28 5 files changed, 47 insertions(+), 4 deletions(-) 28 5 files changed, 47 insertions(+), 4 deletions(-)
29 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 29 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
30 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 30 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
31 31
32diff --git a/configure b/configure 32diff --git a/configure b/configure
33index 2830a1b..6445dc2 100755 33index 2830a1b189..6445dc2d5a 100755
34--- a/configure 34--- a/configure
35+++ b/configure 35+++ b/configure
36@@ -712,7 +712,7 @@ fi 36@@ -712,7 +712,7 @@ fi
@@ -43,7 +43,7 @@ index 2830a1b..6445dc2 100755
43 43
44 # build qmake 44 # build qmake
45diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 45diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
46index 934a18a..0f5b1b6 100644 46index 934a18a924..0f5b1b6333 100644
47--- a/mkspecs/features/configure.prf 47--- a/mkspecs/features/configure.prf
48+++ b/mkspecs/features/configure.prf 48+++ b/mkspecs/features/configure.prf
49@@ -46,14 +46,14 @@ defineTest(qtCompileTest) { 49@@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
@@ -64,7 +64,7 @@ index 934a18a..0f5b1b6 100644
64 msg = "test $$1 succeeded" 64 msg = "test $$1 succeeded"
65 write_file($$QMAKE_CONFIG_LOG, msg, append) 65 write_file($$QMAKE_CONFIG_LOG, msg, append)
66diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 66diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
67index 1903e50..c093dd4 100644 67index 1903e509c8..c093dd4592 100644
68--- a/mkspecs/features/qt_functions.prf 68--- a/mkspecs/features/qt_functions.prf
69+++ b/mkspecs/features/qt_functions.prf 69+++ b/mkspecs/features/qt_functions.prf
70@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { 70@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -78,7 +78,7 @@ index 1903e50..c093dd4 100644
78 cmd = perl -w $$system_path($${cmd}.pl) 78 cmd = perl -w $$system_path($${cmd}.pl)
79diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 79diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
80new file mode 100644 80new file mode 100644
81index 0000000..30d31ed 81index 0000000000..30d31ed16d
82--- /dev/null 82--- /dev/null
83+++ b/mkspecs/linux-oe-g++/qmake.conf 83+++ b/mkspecs/linux-oe-g++/qmake.conf
84@@ -0,0 +1,42 @@ 84@@ -0,0 +1,42 @@
@@ -126,7 +126,7 @@ index 0000000..30d31ed
126+load(qt_config) 126+load(qt_config)
127diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 127diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
128new file mode 100644 128new file mode 100644
129index 0000000..5d22fb4 129index 0000000000..5d22fb4101
130--- /dev/null 130--- /dev/null
131+++ b/mkspecs/linux-oe-g++/qplatformdefs.h 131+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
132@@ -0,0 +1 @@ 132@@ -0,0 +1 @@
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 5c23052b..81600f8f 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 @@
1From 7c0c897d0d534bfc9183f9da1d9b280e709b0917 Mon Sep 17 00:00:00 2001 1From eb39258656c27c72c34674201b946d27eeefe24a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2
19 3 files changed, 6 insertions(+), 6 deletions(-) 19 3 files changed, 6 insertions(+), 6 deletions(-)
20 20
21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 21diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
22index e0652fd..215f435 100644 22index e0652fdcf9..215f4357f8 100644
23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 23--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 24+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 25@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -50,7 +50,7 @@ index e0652fd..215f435 100644
50 _qt5_Core_check_file_exists(${imported_location}) 50 _qt5_Core_check_file_exists(${imported_location})
51 51
52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in 52diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
53index 1d94715..301af8f 100644 53index 1d947159e2..301af8f1b2 100644
54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in 54--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in 55+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) 56@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -72,7 +72,7 @@ index 1d94715..301af8f 100644
72 _qt5_DBus_check_file_exists(${imported_location}) 72 _qt5_DBus_check_file_exists(${imported_location})
73 73
74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 74diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
75index 99d87e2..5621dc0 100644 75index 99d87e2e46..5621dc0fae 100644
76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in 76--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in 77+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
78@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) 78@@ -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 d0d5390d..e2c6ed4b 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 @@
1From d52e2787db887056eed59b9020f1ca625cffa2e4 Mon Sep 17 00:00:00 2001 1From b5dac69f4309950b828566002d07662b77e34097 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the 4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 4 insertions(+), 1 deletion(-) 19 1 file changed, 4 insertions(+), 1 deletion(-)
20 20
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 422d08f..a59df4f 100644 22index 422d08f32c..a59df4f20e 100644
23--- a/src/corelib/global/qlibraryinfo.cpp 23--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp 24+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -172,7 +172,10 @@ void QLibrarySettings::load() 25@@ -172,7 +172,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 e806fabb..db4fd8d1 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 @@
1From eb7df134dff6991cf9d84ea0c8313dfa1f2cc4dc Mon Sep 17 00:00:00 2001 1From a635233ec28ce588ffb5a46fb9fbbda318dafb35 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
15 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
16 16
17diff --git a/configure.pri b/configure.pri 17diff --git a/configure.pri b/configure.pri
18index 0512ef0..8a53223 100644 18index 0512ef0144..8a53223a4e 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -817,10 +817,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -817,10 +817,10 @@ defineTest(qtConfOutput_preparePaths) {
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 88967e78..4d6e3f95 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 @@
1From a1799db5d1b2e2e7d47c37872e887dfab4b4974a Mon Sep 17 00:00:00 2001 1From 245cca40e10db2f9528a03c4941308a52ab26844 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300 3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out 4Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,7 +10,7 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
10 1 file changed, 2 insertions(+), 1 deletion(-) 10 1 file changed, 2 insertions(+), 1 deletion(-)
11 11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf 12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index 6e29eaa..de8c8d2 100644 13index 6e29eaa2b7..de8c8d26e6 100644
14--- a/mkspecs/features/qt_configure.prf 14--- a/mkspecs/features/qt_configure.prf
15+++ b/mkspecs/features/qt_configure.prf 15+++ b/mkspecs/features/qt_configure.prf
16@@ -1265,7 +1265,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1265,7 +1265,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
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 3d5a7323..a24af4a2 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 @@
1From 2df6d12cfef0769f7801410cad012dd20d0497e2 Mon Sep 17 00:00:00 2001 1From 8d321a556a0fe17a549c4c07fb8a5ddf8a29ada1 Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com> 2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 11 May 2016 15:20:41 +0200 3Date: Wed, 11 May 2016 15:20:41 +0200
4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
30 2 files changed, 10 insertions(+) 30 2 files changed, 10 insertions(+)
31 31
32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
33index 27f4c27..01f68a5 100644 33index 27f4c277d6..01f68a569d 100644
34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
36@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) 36@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@@ -46,7 +46,7 @@ index 27f4c27..01f68a5 100644
46 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) 46 !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
47 set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") 47 set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
48diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in 48diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in
49index 6b6544f..d317912 100644 49index 6b6544f932..d317912632 100644
50--- a/src/corelib/Qt5Config.cmake.in 50--- a/src/corelib/Qt5Config.cmake.in
51+++ b/src/corelib/Qt5Config.cmake.in 51+++ b/src/corelib/Qt5Config.cmake.in
52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) 52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
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 57ad3f87..0a1b7c2f 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 @@
1From 6407bc53339920c16bf384145e4dd95ed0c325d0 Mon Sep 17 00:00:00 2001 1From b13e2643502bd8269515b79f296d3959ad43b100 Mon Sep 17 00:00:00 2001
2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> 2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Wed, 7 Jun 2017 21:00:49 +0900 3Date: Wed, 7 Jun 2017 21:00:49 +0900
4Subject: [PATCH] Delete qlonglong and qulonglong 4Subject: [PATCH] Delete qlonglong and qulonglong
@@ -9,7 +9,7 @@ Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
9 1 file changed, 2 deletions(-) 9 1 file changed, 2 deletions(-)
10 10
11diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 11diff --git a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
12index 09458bd..59a120e 100644 12index 09458bd9c3..59a120eb26 100644
13--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 13--- a/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
14+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro 14+++ b/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pro
15@@ -5,10 +5,8 @@ SUBDIRS=\ 15@@ -5,10 +5,8 @@ SUBDIRS=\
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 1262ffe4..e57c9e9f 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 9f9eac8d12531fe6ec3aa77f719c0b8ca7cfdd75 Mon Sep 17 00:00:00 2001 1From 7e6170bff92157204e2f08da0cb531c133654cc0 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 c6fd5d1..7bf6bfd 100644 17index c6fd5d17c2..7bf6bfd0e6 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 @@
@@ -36,7 +36,7 @@ index c6fd5d1..7bf6bfd 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 fc92ed6..e59b858 100644 39index fc92ed6cbc..e59b858758 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 @@
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 7eb78fac..480d492f 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,11 +1,11 @@
1From ef4ff7241ee33819f11357d5a6ceee58146d63b4 Mon Sep 17 00:00:00 2001 1From fe973eb4d92470888e71996300dec146f31d9512 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 09:11:44 -0700 3Date: Sun, 3 Sep 2017 09:11:44 -0700
4Subject: [PATCH] Add OE specific specs for clang compiler 4Subject: [PATCH] Add OE specific specs for clang compiler
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- 7---
8 mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++++++++++ 8 mkspecs/linux-oe-clang/qmake.conf | 43 ++++++++++++++++++++++++++
9 mkspecs/linux-oe-clang/qplatformdefs.h | 1 + 9 mkspecs/linux-oe-clang/qplatformdefs.h | 1 +
10 2 files changed, 44 insertions(+) 10 2 files changed, 44 insertions(+)
11 create mode 100644 mkspecs/linux-oe-clang/qmake.conf 11 create mode 100644 mkspecs/linux-oe-clang/qmake.conf
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 13
14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf 14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
15new file mode 100644 15new file mode 100644
16index 0000000..ffc9f05 16index 0000000000..ffc9f051db
17--- /dev/null 17--- /dev/null
18+++ b/mkspecs/linux-oe-clang/qmake.conf 18+++ b/mkspecs/linux-oe-clang/qmake.conf
19@@ -0,0 +1,43 @@ 19@@ -0,0 +1,43 @@
@@ -62,7 +62,7 @@ index 0000000..ffc9f05
62+load(qt_config) 62+load(qt_config)
63diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h 63diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
64new file mode 100644 64new file mode 100644
65index 0000000..880c927 65index 0000000000..880c927b21
66--- /dev/null 66--- /dev/null
67+++ b/mkspecs/linux-oe-clang/qplatformdefs.h 67+++ b/mkspecs/linux-oe-clang/qplatformdefs.h
68@@ -0,0 +1 @@ 68@@ -0,0 +1 @@