summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch4
-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.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch14
-rw-r--r--recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch8
14 files changed, 37 insertions, 37 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 07fc2f77..dbb0b9dc 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 1ed7a2e9a883fe1240d89b7b70fb0f296bb2b54f Mon Sep 17 00:00:00 2001 1From 6a84c4a36742716b5db715c2538901f37ff8b1c5 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
@@ -30,7 +30,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 08b49a8..5876721 100755 33index 2830a1b..6445dc2 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
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 fa598834..5c23052b 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 c7dd4e5de1fac8c35df79a86418b6cd552024bd0 Mon Sep 17 00:00:00 2001 1From 7c0c897d0d534bfc9183f9da1d9b280e709b0917 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 545b9a3..c991a9b 100644 22index e0652fd..215f435 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)
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 cc0a3305..d0d5390d 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 f1d359e60e76867cee1df636c5c834fe829f5316 Mon Sep 17 00:00:00 2001 1From d52e2787db887056eed59b9020f1ca625cffa2e4 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 b4ba0b5..11d4c00 100644 22index 422d08f..a59df4f 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 5a3dfea2..e806fabb 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 cb813ec552f965208ecfc9750a0fbf10841322fb Mon Sep 17 00:00:00 2001 1From eb7df134dff6991cf9d84ea0c8313dfa1f2cc4dc 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,10 +15,10 @@ 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 ea48255..0699701 100644 18index 0512ef0..8a53223 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -817,10 +817,10 @@ defineTest(qtConfOutput_preparePaths) {
22 "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ 22 "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \
23 "" \ 23 "" \
24 "/* Installation Info */" \ 24 "/* Installation Info */" \
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 099ea5a1..88967e78 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 642496d2ecd9b322c5b2e68ba9d9190c999d1d56 Mon Sep 17 00:00:00 2001 1From a1799db5d1b2e2e7d47c37872e887dfab4b4974a 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,10 +10,10 @@ 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 d5dcda2..501151d 100644 13index 6e29eaa..de8c8d2 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@@ -1251,7 +1251,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1265,7 +1265,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") 17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
18 return($$result) 18 return($$result)
19 } 19 }
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 cf1a716f..3d5a7323 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 e3fe48be51aa67227ac1b34c01e4c913d82866c2 Mon Sep 17 00:00:00 2001 1From 2df6d12cfef0769f7801410cad012dd20d0497e2 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,12 +30,12 @@ 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 55c74aa..f9ec328 100644 33index 27f4c27..01f68a5 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@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) 36@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
37 message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
37 endif() 38 endif()
38 !!ENDIF
39 39
40+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) 40+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
41+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined") 41+ message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined")
@@ -46,11 +46,11 @@ index 55c74aa..f9ec328 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 75b5348..ed31888 100644 49index 6b6544f..d317912 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 2.8.9) 52@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
53 message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\") 53 message(FATAL_ERROR \"Qt5 requires at least CMake version 3.1.0\")
54 endif() 54 endif()
55 55
56+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS) 56+if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
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 fd9a9e5a..57ad3f87 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 efaae3535a1ac006ec1b3003258b83d905265fd3 Mon Sep 17 00:00:00 2001 1From 6407bc53339920c16bf384145e4dd95ed0c325d0 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
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 81269d2e..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 d79fecb4e8d2040efdc295d06c5e24bdf3cf6b60 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 076610a..cb8431f 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 076610a..cb8431f 100644
26 #endif 26 #endif
27 27
28 #include <algorithm> 28 #include <algorithm>
29@@ -199,7 +199,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)
@@ -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 e45eda2..e64f329 100644 39index fc92ed6..e59b858 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 c210d644..7eb78fac 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,4 +1,4 @@
1From aaeadb4326f1f9df7bbafa0b9fa6937504a1c035 Mon Sep 17 00:00:00 2001 1From ef4ff7241ee33819f11357d5a6ceee58146d63b4 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
diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
index 5fed2ff8..e98b9b2e 100644
--- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
+++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch
@@ -1,4 +1,4 @@
1From 7c7545fc64e78b2a4a411aa392df6f424ee27c5a Mon Sep 17 00:00:00 2001 1From a3358cf43c523af046638337960686e942798d2c 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:44:48 -0700 3Date: Sun, 3 Sep 2017 09:44:48 -0700
4Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T 4Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 1 file changed, 3 insertions(+), 3 deletions(-) 13 1 file changed, 3 insertions(+), 3 deletions(-)
14 14
15diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h 15diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h
16index d29225f..a0cdb57 100644 16index a818d97..959a508 100644
17--- a/mkspecs/linux-clang/qplatformdefs.h 17--- a/mkspecs/linux-clang/qplatformdefs.h
18+++ b/mkspecs/linux-clang/qplatformdefs.h 18+++ b/mkspecs/linux-clang/qplatformdefs.h
19@@ -84,10 +84,10 @@ 19@@ -81,10 +81,10 @@
20 20
21 #undef QT_SOCKLEN_T 21 #undef QT_SOCKLEN_T
22 22
diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
index a0aaa520..94d2ea16 100644
--- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
+++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
@@ -1,4 +1,4 @@
1From ba70f3ca46d921c20bebb5cb9d4b41e64bd02d8b Mon Sep 17 00:00:00 2001 1From 8bf717e2ecda234f626f96ae08e0be3a6eca26d8 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 10:11:50 -0700 3Date: Sun, 3 Sep 2017 10:11:50 -0700
4Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc 4Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 13diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
14index d424e60..3eae828 100644 14index 375cecd..46ca9b1 100644
15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
17@@ -46,7 +46,7 @@ 17@@ -46,7 +46,7 @@
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
index fe1fcf57..89252dea 100644
--- 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
@@ -1,4 +1,4 @@
1From 81fc64f7f3a8b0554fd8d1b96b113bc04b5f0b5c Mon Sep 17 00:00:00 2001 1From f09d998036af014a42c464eea72368c8f2920f6a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 Feb 2018 17:08:43 -0800 3Date: Wed, 14 Feb 2018 17:08:43 -0800
4Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem 4Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem
diff --git a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch
index 66b91d84..ea23cce7 100644
--- a/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0013-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
1From da00a0790c28615ba6b7f8e0e9d62d1ae6dbdeba Mon Sep 17 00:00:00 2001 1From 10f419678fe4f7087c973a8d8dd96bb0d781487b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH] Always build uic and qvkgen 4Subject: [PATCH] Always build uic and qvkgen
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index a2064b1..9fae335 100644 17index 1f7c5d9..6b39379 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -222,7 +222,7 @@ qtConfig(gui) { 20@@ -222,7 +222,7 @@ qtConfig(gui) {
diff --git a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch
index c733c156..57cfe368 100644
--- a/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0014-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
1From 77365eda4dd1c4c26803b3f0d1f411b7416ad531 Mon Sep 17 00:00:00 2001 1From 7691598a164737591068f8670f02a904ffce5dd2 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 24 Nov 2017 15:16:31 +0200 3Date: Fri, 24 Nov 2017 15:16:31 +0200
4Subject: [PATCH] Bootstrap without linkat feature 4Subject: [PATCH] Bootstrap without linkat feature
@@ -13,11 +13,11 @@ Upstream-Status: Inappropriate [OE specific]
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h 15diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h
16index dabb715..5b4ff86 100644 16index 3469ebe..cb889f2 100644
17--- a/src/corelib/global/qconfig-bootstrapped.h 17--- a/src/corelib/global/qconfig-bootstrapped.h
18+++ b/src/corelib/global/qconfig-bootstrapped.h 18+++ b/src/corelib/global/qconfig-bootstrapped.h
19@@ -88,7 +88,7 @@ 19@@ -90,7 +90,7 @@
20 #define QT_FEATURE_futimes -1 20 #define QT_FEATURE_itemmodel -1
21 #define QT_FEATURE_library -1 21 #define QT_FEATURE_library -1
22 #ifdef __linux__ 22 #ifdef __linux__
23-# define QT_FEATURE_linkat 1 23-# define QT_FEATURE_linkat 1