summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-21 19:34:01 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-22 14:35:29 +0000
commitef5f5d912da50e43015de0e7fecb482a7cd4a2fd (patch)
tree8f89fe21421a93ffd0141c5743d1cd67d4961bcd /recipes-qt/qt5/qtbase
parent820f3ef827b874340e9e42000657a110c9a99440 (diff)
downloadmeta-qt5-ef5f5d912da50e43015de0e7fecb482a7cd4a2fd.tar.gz
qt5: upgrade to 5.11.1
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.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch5
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch2
-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.patch2
-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.patch6
-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.patch4
-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.patch4
-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.patch4
14 files changed, 24 insertions, 23 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 c2a0d04d..8f7afb6d 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 0152f09dc119c93cc92bc2bb9de38c64fb0a854e Mon Sep 17 00:00:00 2001 1From bb416ea80d421c53012e13280d68bdcefc815b8f 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
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 81600f8f..3a219c1f 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 eb39258656c27c72c34674201b946d27eeefe24a Mon Sep 17 00:00:00 2001 1From 4941648d4b26d625e86273d992697129209d8256 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
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 2ea9e04d..2450f7ef 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 b5dac69f4309950b828566002d07662b77e34097 Mon Sep 17 00:00:00 2001 1From 1fce658543816f654c6b4abcf02b6190189ba3b7 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
@@ -13,13 +13,14 @@ Upstream-Status: Inappropriate [embedded specific]
13 qmake from sstate and replacing all configured paths in it with qt.conf from 13 qmake from sstate and replacing all configured paths in it with qt.conf from
14 environment). 14 environment).
15 15
16Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 17Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17--- 18---
18 src/corelib/global/qlibraryinfo.cpp | 5 ++++- 19 src/corelib/global/qlibraryinfo.cpp | 5 ++++-
19 1 file changed, 4 insertions(+), 1 deletion(-) 20 1 file changed, 4 insertions(+), 1 deletion(-)
20 21
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 22diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index 422d08f32c..a59df4f20e 100644 23index 422d08f32c..cb092301fa 100644
23--- a/src/corelib/global/qlibraryinfo.cpp 24--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp 25+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -172,7 +172,10 @@ void QLibrarySettings::load() 26@@ -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 db4fd8d1..141923df 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 a635233ec28ce588ffb5a46fb9fbbda318dafb35 Mon Sep 17 00:00:00 2001 1From 0dbc0d39c274f35415122d0b4d001da50d8e5355 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
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 4d6e3f95..24f966f5 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 245cca40e10db2f9528a03c4941308a52ab26844 Mon Sep 17 00:00:00 2001 1From ffc59fc3f976db9008859857c2db1579b7784b57 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 6e29eaa2b7..de8c8d26e6 100644 13index 1211129283..f2c5b3a5a4 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 a24af4a2..537ff3f6 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 8d321a556a0fe17a549c4c07fb8a5ddf8a29ada1 Mon Sep 17 00:00:00 2001 1From 78d36c322ca9d8d90a419b15febef4c11bf9066b 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
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 0a1b7c2f..9b449d36 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 b13e2643502bd8269515b79f296d3959ad43b100 Mon Sep 17 00:00:00 2001 1From ee84c3b9cc8add6ee0c1a49c167b51f8d37230ae 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 e57c9e9f..77b11a4b 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 7e6170bff92157204e2f08da0cb531c133654cc0 Mon Sep 17 00:00:00 2001 1From ef85b182bc1f2f6a337c6946fdbf3b37ade936cb 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 c6fd5d17c2..7bf6bfd0e6 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 fc92ed6cbc..e59b858758 100644 39index 263a475435..11994b3c4f 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 fc92ed6cbc..e59b858758 100644
47 #endif 47 #endif
48 48
49 #include "private/qhostinfo_p.h" 49 #include "private/qhostinfo_p.h"
50@@ -2136,8 +2137,8 @@ public slots: 50@@ -2132,8 +2133,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();
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 480d492f..3aa0d2dd 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 fe973eb4d92470888e71996300dec146f31d9512 Mon Sep 17 00:00:00 2001 1From 9a370262cce48a78b944a8d6e77257f915ab76e6 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 e98b9b2e..5b8a10d6 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 a3358cf43c523af046638337960686e942798d2c Mon Sep 17 00:00:00 2001 1From c8840a63123e084cd5b2b3b8f10df72ed0ba2efb 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,7 +13,7 @@ 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 a818d97..959a508 100644 16index a818d973f0..959a508d3a 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@@ -81,10 +81,10 @@ 19@@ -81,10 +81,10 @@
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 94d2ea16..cc82877e 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 8bf717e2ecda234f626f96ae08e0be3a6eca26d8 Mon Sep 17 00:00:00 2001 1From 50c9fd7dc392ac4591c37bc3c97a6e48486e01b7 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 375cecd..46ca9b1 100644 14index 375cecd521..46ca9b11cc 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 89252dea..1d6f3632 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 f09d998036af014a42c464eea72368c8f2920f6a Mon Sep 17 00:00:00 2001 1From b41e0477f9b7aad73c94833dc750971a606871dc 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
@@ -19,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
19 1 file changed, 1 insertion(+), 1 deletion(-) 19 1 file changed, 1 insertion(+), 1 deletion(-)
20 20
21diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf 21diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
22index 234f71d..ee3da02 100644 22index 234f71d495..ee3da023e6 100644
23--- a/mkspecs/common/gcc-base.conf 23--- a/mkspecs/common/gcc-base.conf
24+++ b/mkspecs/common/gcc-base.conf 24+++ b/mkspecs/common/gcc-base.conf
25@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g 25@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g
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 ea23cce7..541e2dfc 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 10f419678fe4f7087c973a8d8dd96bb0d781487b Mon Sep 17 00:00:00 2001 1From 2457aafe89d811bb01bd3d185e5a5818671209a2 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 1f7c5d9..6b39379 100644 17index 1f7c5d99c1..6b39379dd0 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 57cfe368..f58f70a0 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 7691598a164737591068f8670f02a904ffce5dd2 Mon Sep 17 00:00:00 2001 1From 24be588f9998e3874047d9394a09becaf11ccddd 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,7 +13,7 @@ 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 3469ebe..cb889f2 100644 16index 3469ebe5e6..cb889f27c2 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@@ -90,7 +90,7 @@ 19@@ -90,7 +90,7 @@