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.patch8
-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.patch6
-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.patch4
-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.patch10
-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.patch2
-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.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch (renamed from recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch)6
-rw-r--r--recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch344
-rw-r--r--recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch (renamed from recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch)2
-rw-r--r--recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch (renamed from recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch)2
-rw-r--r--recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch40
-rw-r--r--recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch (renamed from recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch)4
-rw-r--r--recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch (renamed from recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch)10
-rw-r--r--recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch (renamed from recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch)2
-rw-r--r--recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch (renamed from recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch)4
-rw-r--r--recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch31
22 files changed, 44 insertions, 459 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 7195da8f..ae4d89de 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 ff46b3e91a384888b299a5444adc0e9abc110d3b Mon Sep 17 00:00:00 2001 1From 9f6cab0c540e7367de851ef19fd2928087b0f307 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
@@ -31,7 +31,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
32 32
33diff --git a/configure b/configure 33diff --git a/configure b/configure
34index 2830a1b189..6445dc2d5a 100755 34index ef7bad1bfc..dcca0f9135 100755
35--- a/configure 35--- a/configure
36+++ b/configure 36+++ b/configure
37@@ -712,7 +712,7 @@ fi 37@@ -712,7 +712,7 @@ fi
@@ -65,7 +65,7 @@ index 934a18a924..0f5b1b6333 100644
65 msg = "test $$1 succeeded" 65 msg = "test $$1 succeeded"
66 write_file($$QMAKE_CONFIG_LOG, msg, append) 66 write_file($$QMAKE_CONFIG_LOG, msg, append)
67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
68index b57afcf72d..afa1c39b3e 100644 68index d16b3cf1be..df219ce34c 100644
69--- a/mkspecs/features/qt.prf 69--- a/mkspecs/features/qt.prf
70+++ b/mkspecs/features/qt.prf 70+++ b/mkspecs/features/qt.prf
71@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { 71@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) {
@@ -77,7 +77,7 @@ index b57afcf72d..afa1c39b3e 100644
77 LIBS += -L$$plug_path/$$plug_type 77 LIBS += -L$$plug_path/$$plug_type
78 } 78 }
79 LIBS += -l$${plug}$$qtPlatformTargetSuffix() 79 LIBS += -l$${plug}$$qtPlatformTargetSuffix()
80@@ -298,8 +298,8 @@ for(ever) { 80@@ -307,8 +307,8 @@ for(ever) {
81 # static builds: link qml import plugins into the target. 81 # static builds: link qml import plugins into the target.
82 contains(all_qt_module_deps, qml): \ 82 contains(all_qt_module_deps, qml): \
83 qtConfig(static):import_plugins:!host_build:!no_import_scan { 83 qtConfig(static):import_plugins:!host_build:!no_import_scan {
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 9766d50b..26b487c5 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 2592ce6190596219428eb5e500c3a5f5a14dad01 Mon Sep 17 00:00:00 2001 1From 5d9dbd6fb7a069877f2e4e4880134c07343d8edc 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 614bdec3..d49ec61e 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 0ce64385c882e1f7788620ba37781d89625437cb Mon Sep 17 00:00:00 2001 1From 4bab728a4d9ecf3a4626a945a671d236458f74a2 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
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 1 file changed, 4 insertions(+), 1 deletion(-) 20 1 file changed, 4 insertions(+), 1 deletion(-)
21 21
22diff --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
23index e727f00c8e..819dbb8aa3 100644 23index 4119012d85..6395d10561 100644
24--- a/src/corelib/global/qlibraryinfo.cpp 24--- a/src/corelib/global/qlibraryinfo.cpp
25+++ b/src/corelib/global/qlibraryinfo.cpp 25+++ b/src/corelib/global/qlibraryinfo.cpp
26@@ -172,7 +172,10 @@ void QLibrarySettings::load() 26@@ -174,7 +174,10 @@ void QLibrarySettings::load()
27 QSettings *QLibraryInfoPrivate::findConfiguration() 27 QSettings *QLibraryInfoPrivate::findConfiguration()
28 { 28 {
29 #ifdef QT_BUILD_QMAKE 29 #ifdef QT_BUILD_QMAKE
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 d97bc569..4b48081e 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 9858c07dd25d523f8e02b348c21e57c95077e108 Mon Sep 17 00:00:00 2001 1From 3f34b8d782f26876e4e62c6201454ea74ef90ab3 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 6e7f6b76a4..35d15685ee 100644 18index b3b3e27c44..45b5495bfd 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -821,10 +821,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -837,10 +837,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 6e5aa3e1..0369e52c 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 374bf57efe5f936ab61811f7c433c870cdae77ab Mon Sep 17 00:00:00 2001 1From 68a9d70b13773587c7be0f5dad1829e4081749d1 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 4039bba431..153edbfa30 100644 13index fe14ea1f40..1ee89bac46 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@@ -1266,7 +1266,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1520,7 +1520,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 b8689813..25b44db3 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 29270c9427ad9e024ecffb94f5431c08f755925d Mon Sep 17 00:00:00 2001 1From 7406b73bc09b9b61b34417d384033b3f21959c6e 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 27f4c277d6..01f68a569d 100644 33index 3ed6dd5889..52b69b26f6 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)
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 2b0c8c9d..fdf8ac13 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 c374524c31fbf11f8f2cd8d1036633f5c7507619 Mon Sep 17 00:00:00 2001 1From fdaadd9cd531866ac414970d1bec24a4b89a8538 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 b5cf78ec..2da95175 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 40b0cf799c4af4ae92eebab64e91015d67e428c1 Mon Sep 17 00:00:00 2001 1From 1caa83ba191dd4a819a6b7db5da8c293a1f46c57 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,10 +14,10 @@ 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 e312199980..5789174ad5 100644 17index 5d9b5ca95c..ffcbddc442 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@@ -35,7 +35,7 @@
21 #include "tst_qvariant_common.h" 21 #include "tst_qvariant_common.h"
22 22
23 #ifdef Q_OS_LINUX 23 #ifdef Q_OS_LINUX
@@ -26,7 +26,7 @@ index e312199980..5789174ad5 100644
26 #endif 26 #endif
27 27
28 #include <algorithm> 28 #include <algorithm>
29@@ -205,7 +205,7 @@ protected: 29@@ -365,7 +365,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 e312199980..5789174ad5 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 263a475435..11994b3c4f 100644 39index c473230246..1db8d6f225 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 144c9182..90b54fee 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 d8c3ea974639c70d9a158d4e01c3f782133a46f8 Mon Sep 17 00:00:00 2001 1From b2bbab58fa5062011770b5a32d2d73e0c854623b 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 5dce2003..0884863b 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 0ada7d8bec024960b2e10c9ac36f312bb0f5338c Mon Sep 17 00:00:00 2001 1From 37dae545c6c5134b8c7aaac5e398cfec54349493 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
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 935c746a..e6ded389 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 0c80cc78c3ca53134a1c66824f749676fa966246 Mon Sep 17 00:00:00 2001 1From bcb16ca13fd33efaf24f62fb8253d7aeae3e3c91 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 b7cb8a1bdc..f6e6545948 100644 14index 5d344834e6..1afc70d255 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 e894f34c..e652f97e 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 2856cb239b64b7d0330bb016e080ed294f9bad3e Mon Sep 17 00:00:00 2001 1From 0ba4c8db7ec77d36e12fafd210ec189ccb176e96 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
@@ -22,7 +22,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
22 2 files changed, 2 insertions(+), 2 deletions(-) 22 2 files changed, 2 insertions(+), 2 deletions(-)
23 23
24diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf 24diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
25index 0fb84bc1b3..68b49b5303 100644 25index 5800aaa5b4..7b4901ce46 100644
26--- a/mkspecs/common/clang.conf 26--- a/mkspecs/common/clang.conf
27+++ b/mkspecs/common/clang.conf 27+++ b/mkspecs/common/clang.conf
28@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX 28@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX
@@ -35,7 +35,7 @@ index 0fb84bc1b3..68b49b5303 100644
35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} 35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
36 QMAKE_CFLAGS_LTCG = -flto 36 QMAKE_CFLAGS_LTCG = -flto
37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf 37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
38index 234f71d495..c7d81a902e 100644 38index c2669e4833..3fde8dc85f 100644
39--- a/mkspecs/common/gcc-base.conf 39--- a/mkspecs/common/gcc-base.conf
40+++ b/mkspecs/common/gcc-base.conf 40+++ b/mkspecs/common/gcc-base.conf
41@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g 41@@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g
diff --git a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
index 09ec0fa9..27b354b2 100644
--- a/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
+++ b/recipes-qt/qt5/qtbase/0013-Check-glibc-version-for-renameat2-statx-on-non-boots.patch
@@ -1,4 +1,4 @@
1From fb6a20e6917cfa32e69791e0adb130140f4b5688 Mon Sep 17 00:00:00 2001 1From ebd6d61f9031fec80c7dde35819cabec727179aa Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Tue, 21 Aug 2018 00:29:06 +0200 3Date: Tue, 21 Aug 2018 00:29:06 +0200
4Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped 4Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped
@@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
15 1 file changed, 11 insertions(+) 15 1 file changed, 11 insertions(+)
16 16
17diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp 17diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
18index 964dcebeb2..c09eb0154b 100644 18index b2d81066db..b90e3dc15d 100644
19--- a/src/corelib/io/qfilesystemengine_unix.cpp 19--- a/src/corelib/io/qfilesystemengine_unix.cpp
20+++ b/src/corelib/io/qfilesystemengine_unix.cpp 20+++ b/src/corelib/io/qfilesystemengine_unix.cpp
21@@ -95,6 +95,17 @@ extern "C" NSString *NSTemporaryDirectory(); 21@@ -93,6 +93,17 @@ extern "C" NSString *NSTemporaryDirectory();
22 #ifndef FICLONE 22 #ifndef FICLONE
23 # define FICLONE _IOW(0x94, 9, int) 23 # define FICLONE _IOW(0x94, 9, int)
24 #endif 24 #endif
diff --git a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch b/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
deleted file mode 100644
index 138d1f7f..00000000
--- a/recipes-qt/qt5/qtbase/0013-Upgrade-double-conversion-to-v3.0.0.patch
+++ /dev/null
@@ -1,344 +0,0 @@
1From f20acf6fa22235fdaa551b0410d65627e028f4b4 Mon Sep 17 00:00:00 2001
2From: Ulf Hermann <ulf.hermann@qt.io>
3Date: Fri, 27 Apr 2018 10:38:18 +0200
4Subject: [PATCH] Upgrade double-conversion to v3.0.0
5
6This fixes their issue #41, a potential undefined behavior.
7
8We preserve the locally added "__ghs" clause as well as the _M_ARM_FP
9clause necessary for winrt in utils.h.
10
11[ChangeLog][Third-Party Code] double-conversion got updated to upstream
12version 3.0.0.
13
14Task-number: QTBUG-66561
15Change-Id: Id79125bdeeaebb61dca2e2885d3370accce9030c
16Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
17Upstream-Status: Backport
18---
19 src/3rdparty/double-conversion/bignum.cc | 2 +-
20 src/3rdparty/double-conversion/bignum.h | 1 -
21 .../double-conversion/cached-powers.cc | 5 +--
22 src/3rdparty/double-conversion/diy-fp.h | 22 +++++------
23 .../double-conversion/double-conversion.cc | 21 ++++++----
24 src/3rdparty/double-conversion/fixed-dtoa.cc | 5 ++-
25 src/3rdparty/double-conversion/ieee.h | 2 +-
26 .../include/double-conversion/utils.h | 38 +++++++++++++------
27 .../double-conversion/qt_attribution.json | 4 +-
28 src/3rdparty/double-conversion/strtod.cc | 2 +-
29 10 files changed, 60 insertions(+), 42 deletions(-)
30
31diff --git a/src/3rdparty/double-conversion/bignum.cc b/src/3rdparty/double-conversion/bignum.cc
32index 2743d67e8d..8892de8f2a 100644
33--- a/src/3rdparty/double-conversion/bignum.cc
34+++ b/src/3rdparty/double-conversion/bignum.cc
35@@ -104,7 +104,7 @@ void Bignum::AssignDecimalString(Vector<const char> value) {
36 const int kMaxUint64DecimalDigits = 19;
37 Zero();
38 int length = value.length();
39- int pos = 0;
40+ unsigned int pos = 0;
41 // Let's just say that each digit needs 4 bits.
42 while (length >= kMaxUint64DecimalDigits) {
43 uint64_t digits = ReadUInt64(value, pos, kMaxUint64DecimalDigits);
44diff --git a/src/3rdparty/double-conversion/bignum.h b/src/3rdparty/double-conversion/bignum.h
45index 5ec3544f57..c385f2237b 100644
46--- a/src/3rdparty/double-conversion/bignum.h
47+++ b/src/3rdparty/double-conversion/bignum.h
48@@ -49,7 +49,6 @@ class Bignum {
49
50 void AssignPowerUInt16(uint16_t base, int exponent);
51
52- void AddUInt16(uint16_t operand);
53 void AddUInt64(uint64_t operand);
54 void AddBignum(const Bignum& other);
55 // Precondition: this >= other.
56diff --git a/src/3rdparty/double-conversion/cached-powers.cc b/src/3rdparty/double-conversion/cached-powers.cc
57index 9536f26927..2b43f06412 100644
58--- a/src/3rdparty/double-conversion/cached-powers.cc
59+++ b/src/3rdparty/double-conversion/cached-powers.cc
60@@ -131,7 +131,6 @@ static const CachedPower kCachedPowers[] = {
61 {UINT64_2PART_C(0xaf87023b, 9bf0ee6b), 1066, 340},
62 };
63
64-static const int kCachedPowersLength = ARRAY_SIZE(kCachedPowers);
65 static const int kCachedPowersOffset = 348; // -1 * the first decimal_exponent.
66 static const double kD_1_LOG2_10 = 0.30102999566398114; // 1 / lg(10)
67 // Difference between the decimal exponents in the table above.
68@@ -144,14 +143,12 @@ void PowersOfTenCache::GetCachedPowerForBinaryExponentRange(
69 int max_exponent,
70 DiyFp* power,
71 int* decimal_exponent) {
72- (void)max_exponent; // Silence unused parameter warning in release builds
73- (void)kCachedPowersLength; // Silence unused parameter warning in release builds
74 int kQ = DiyFp::kSignificandSize;
75 double k = ceil((min_exponent + kQ - 1) * kD_1_LOG2_10);
76 int foo = kCachedPowersOffset;
77 int index =
78 (foo + static_cast<int>(k) - 1) / kDecimalExponentDistance + 1;
79- ASSERT(0 <= index && index < kCachedPowersLength);
80+ ASSERT(0 <= index && index < static_cast<int>(ARRAY_SIZE(kCachedPowers)));
81 CachedPower cached_power = kCachedPowers[index];
82 ASSERT(min_exponent <= cached_power.binary_exponent);
83 (void) max_exponent; // Mark variable as used.
84diff --git a/src/3rdparty/double-conversion/diy-fp.h b/src/3rdparty/double-conversion/diy-fp.h
85index 9dcf8fbdba..2edf34674e 100644
86--- a/src/3rdparty/double-conversion/diy-fp.h
87+++ b/src/3rdparty/double-conversion/diy-fp.h
88@@ -42,7 +42,7 @@ class DiyFp {
89 static const int kSignificandSize = 64;
90
91 DiyFp() : f_(0), e_(0) {}
92- DiyFp(uint64_t f, int e) : f_(f), e_(e) {}
93+ DiyFp(uint64_t significand, int exponent) : f_(significand), e_(exponent) {}
94
95 // this = this - other.
96 // The exponents of both numbers must be the same and the significand of this
97@@ -76,22 +76,22 @@ class DiyFp {
98
99 void Normalize() {
100 ASSERT(f_ != 0);
101- uint64_t f = f_;
102- int e = e_;
103+ uint64_t significand = f_;
104+ int exponent = e_;
105
106 // This method is mainly called for normalizing boundaries. In general
107 // boundaries need to be shifted by 10 bits. We thus optimize for this case.
108 const uint64_t k10MSBits = UINT64_2PART_C(0xFFC00000, 00000000);
109- while ((f & k10MSBits) == 0) {
110- f <<= 10;
111- e -= 10;
112+ while ((significand & k10MSBits) == 0) {
113+ significand <<= 10;
114+ exponent -= 10;
115 }
116- while ((f & kUint64MSB) == 0) {
117- f <<= 1;
118- e--;
119+ while ((significand & kUint64MSB) == 0) {
120+ significand <<= 1;
121+ exponent--;
122 }
123- f_ = f;
124- e_ = e;
125+ f_ = significand;
126+ e_ = exponent;
127 }
128
129 static DiyFp Normalize(const DiyFp& a) {
130diff --git a/src/3rdparty/double-conversion/double-conversion.cc b/src/3rdparty/double-conversion/double-conversion.cc
131index 909985be82..6f21a0124c 100644
132--- a/src/3rdparty/double-conversion/double-conversion.cc
133+++ b/src/3rdparty/double-conversion/double-conversion.cc
134@@ -118,7 +118,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation(
135 StringBuilder* result_builder) const {
136 // Create a representation that is padded with zeros if needed.
137 if (decimal_point <= 0) {
138- // "0.00000decimal_rep".
139+ // "0.00000decimal_rep" or "0.000decimal_rep00".
140 result_builder->AddCharacter('0');
141 if (digits_after_point > 0) {
142 result_builder->AddCharacter('.');
143@@ -129,7 +129,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation(
144 result_builder->AddPadding('0', remaining_digits);
145 }
146 } else if (decimal_point >= length) {
147- // "decimal_rep0000.00000" or "decimal_rep.0000"
148+ // "decimal_rep0000.00000" or "decimal_rep.0000".
149 result_builder->AddSubstring(decimal_digits, length);
150 result_builder->AddPadding('0', decimal_point - length);
151 if (digits_after_point > 0) {
152@@ -137,7 +137,7 @@ void DoubleToStringConverter::CreateDecimalRepresentation(
153 result_builder->AddPadding('0', digits_after_point);
154 }
155 } else {
156- // "decima.l_rep000"
157+ // "decima.l_rep000".
158 ASSERT(digits_after_point > 0);
159 result_builder->AddSubstring(decimal_digits, decimal_point);
160 result_builder->AddCharacter('.');
161@@ -494,10 +494,17 @@ static double SignedZero(bool sign) {
162 // because it constant-propagated the radix and concluded that the last
163 // condition was always true. By moving it into a separate function the
164 // compiler wouldn't warn anymore.
165+#if _MSC_VER
166+#pragma optimize("",off)
167 static bool IsDecimalDigitForRadix(int c, int radix) {
168 return '0' <= c && c <= '9' && (c - '0') < radix;
169 }
170-
171+#pragma optimize("",on)
172+#else
173+static bool inline IsDecimalDigitForRadix(int c, int radix) {
174+ return '0' <= c && c <= '9' && (c - '0') < radix;
175+}
176+#endif
177 // Returns true if 'c' is a character digit that is valid for the given radix.
178 // The 'a_character' should be 'a' or 'A'.
179 //
180@@ -852,9 +859,9 @@ double StringToDoubleConverter::StringToIeee(
181 return junk_string_value_;
182 }
183 }
184- char sign = '+';
185+ char exponen_sign = '+';
186 if (*current == '+' || *current == '-') {
187- sign = static_cast<char>(*current);
188+ exponen_sign = static_cast<char>(*current);
189 ++current;
190 if (current == end) {
191 if (allow_trailing_junk) {
192@@ -888,7 +895,7 @@ double StringToDoubleConverter::StringToIeee(
193 ++current;
194 } while (current != end && *current >= '0' && *current <= '9');
195
196- exponent += (sign == '-' ? -num : num);
197+ exponent += (exponen_sign == '-' ? -num : num);
198 }
199
200 if (!(allow_trailing_spaces || allow_trailing_junk) && (current != end)) {
201diff --git a/src/3rdparty/double-conversion/fixed-dtoa.cc b/src/3rdparty/double-conversion/fixed-dtoa.cc
202index aef65fdc21..0f55a0b6eb 100644
203--- a/src/3rdparty/double-conversion/fixed-dtoa.cc
204+++ b/src/3rdparty/double-conversion/fixed-dtoa.cc
205@@ -98,7 +98,7 @@ class UInt128 {
206 return high_bits_ == 0 && low_bits_ == 0;
207 }
208
209- int BitAt(int position) {
210+ int BitAt(int position) const {
211 if (position >= 64) {
212 return static_cast<int>(high_bits_ >> (position - 64)) & 1;
213 } else {
214@@ -259,7 +259,8 @@ static void FillFractionals(uint64_t fractionals, int exponent,
215 fractionals -= static_cast<uint64_t>(digit) << point;
216 }
217 // If the first bit after the point is set we have to round up.
218- if (((fractionals >> (point - 1)) & 1) == 1) {
219+ ASSERT(fractionals == 0 || point - 1 >= 0);
220+ if ((fractionals != 0) && ((fractionals >> (point - 1)) & 1) == 1) {
221 RoundUp(buffer, length, decimal_point);
222 }
223 } else { // We need 128 bits.
224diff --git a/src/3rdparty/double-conversion/ieee.h b/src/3rdparty/double-conversion/ieee.h
225index 661141d1a8..b14cf4f717 100644
226--- a/src/3rdparty/double-conversion/ieee.h
227+++ b/src/3rdparty/double-conversion/ieee.h
228@@ -99,7 +99,7 @@ class Double {
229 }
230
231 double PreviousDouble() const {
232- if (d64_ == (kInfinity | kSignMask)) return -Double::Infinity();
233+ if (d64_ == (kInfinity | kSignMask)) return -Infinity();
234 if (Sign() < 0) {
235 return Double(d64_ + 1).value();
236 } else {
237diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
238index 20bfd36c84..ca7646d817 100644
239--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
240+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
241@@ -33,19 +33,29 @@
242
243 #include <assert.h>
244 #ifndef ASSERT
245-# if defined(WINCE) || defined(_WIN32_WCE)
246-# define ASSERT(condition)
247-# else
248-# define ASSERT(condition) \
249+#define ASSERT(condition) \
250 assert(condition);
251-# endif
252 #endif
253 #ifndef UNIMPLEMENTED
254-# define UNIMPLEMENTED() (exit(-1))
255+#define UNIMPLEMENTED() (abort())
256+#endif
257+#ifndef DOUBLE_CONVERSION_NO_RETURN
258+#ifdef _MSC_VER
259+#define DOUBLE_CONVERSION_NO_RETURN __declspec(noreturn)
260+#else
261+#define DOUBLE_CONVERSION_NO_RETURN __attribute__((noreturn))
262+#endif
263 #endif
264 #ifndef UNREACHABLE
265-# define UNREACHABLE() (exit(-1))
266+#ifdef _MSC_VER
267+void DOUBLE_CONVERSION_NO_RETURN abort_noreturn();
268+inline void abort_noreturn() { abort(); }
269+#define UNREACHABLE() (abort_noreturn())
270+#else
271+#define UNREACHABLE() (abort())
272 #endif
273+#endif
274+
275
276 // Double operations detection based on target architecture.
277 // Linux uses a 80bit wide floating point stack on x86. This induces double
278@@ -62,11 +72,15 @@
279 defined(__hppa__) || defined(__ia64__) || \
280 defined(__mips__) || \
281 defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
282+ defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
283 defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
284 defined(__SH4__) || defined(__alpha__) || \
285 defined(_MIPS_ARCH_MIPS32R2) || \
286- defined(__AARCH64EL__)
287+ defined(__AARCH64EL__) || defined(__aarch64__) || \
288+ defined(__riscv)
289 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
290+#elif defined(__mc68000__)
291+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
292 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
293 #if defined(_WIN32)
294 // Windows uses a 64bit wide floating point stack.
295@@ -172,8 +186,8 @@ template <typename T>
296 class Vector {
297 public:
298 Vector() : start_(NULL), length_(0) {}
299- Vector(T* data, int length) : start_(data), length_(length) {
300- ASSERT(length == 0 || (length > 0 && data != NULL));
301+ Vector(T* data, int len) : start_(data), length_(len) {
302+ ASSERT(len == 0 || (len > 0 && data != NULL));
303 }
304
305 // Returns a vector using the same backing storage as this one,
306@@ -215,8 +229,8 @@ class Vector {
307 // buffer bounds on all operations in debug mode.
308 class StringBuilder {
309 public:
310- StringBuilder(char* buffer, int size)
311- : buffer_(buffer, size), position_(0) { }
312+ StringBuilder(char* buffer, int buffer_size)
313+ : buffer_(buffer, buffer_size), position_(0) { }
314
315 ~StringBuilder() { if (!is_finalized()) Finalize(); }
316
317diff --git a/src/3rdparty/double-conversion/qt_attribution.json b/src/3rdparty/double-conversion/qt_attribution.json
318index 92118ac779..d41a7ef332 100644
319--- a/src/3rdparty/double-conversion/qt_attribution.json
320+++ b/src/3rdparty/double-conversion/qt_attribution.json
321@@ -5,8 +5,8 @@
322 "QtUsage": "Used in Qt Core. Configure with -system-doubleconversion or -no-doubleconversion to avoid.",
323
324 "Homepage": "https://github.com/google/double-conversion",
325- "Version": "2.0.1",
326- "DownloadLocation": "https://github.com/google/double-conversion/commit/2fb03de56faa32bbba5e02222528e7b760f71d77",
327+ "Version": "3.0.0",
328+ "DownloadLocation": "https://github.com/google/double-conversion/commit/ca220cbafa83ca706f028bfbb5adc7eb2f1f90e1",
329 "License": "BSD 3-clause \"New\" or \"Revised\" License",
330 "LicenseId": "BSD-3-Clause",
331 "LicenseFile": "LICENSE",
332diff --git a/src/3rdparty/double-conversion/strtod.cc b/src/3rdparty/double-conversion/strtod.cc
333index 34717562bd..17abcbb2a5 100644
334--- a/src/3rdparty/double-conversion/strtod.cc
335+++ b/src/3rdparty/double-conversion/strtod.cc
336@@ -286,7 +286,7 @@ static bool DiyFpStrtod(Vector<const char> buffer,
337 const int kDenominator = 1 << kDenominatorLog;
338 // Move the remaining decimals into the exponent.
339 exponent += remaining_decimals;
340- int error = (remaining_decimals == 0 ? 0 : kDenominator / 2);
341+ uint64_t error = (remaining_decimals == 0 ? 0 : kDenominator / 2);
342
343 int old_e = input.e();
344 input.Normalize();
diff --git a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch
index e6ba5a35..d4a47fb8 100644
--- a/recipes-qt/qt5/qtbase/0016-Disable-ltcg-for-host_build.patch
+++ b/recipes-qt/qt5/qtbase/0014-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
1From e9ea14a04e74be6740b82d51340bb6218f35ab1f Mon Sep 17 00:00:00 2001 1From baa8339d0fda285b7410066827644aa8af0e5dfb Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 23 Oct 2018 09:54:57 +0300 3Date: Tue, 23 Oct 2018 09:54:57 +0300
4Subject: [PATCH] Disable ltcg for host_build 4Subject: [PATCH] Disable ltcg for host_build
diff --git a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
index 54b0f640..f620b3d7 100644
--- a/recipes-qt/qt5/qtbase/0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
+++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
@@ -1,4 +1,4 @@
1From f5b11bb3ab6299912491568f84185e0174cc6e5a Mon Sep 17 00:00:00 2001 1From 744a866a54780ab2c1acf9da875be0845726b20f Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com> 2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Sat, 27 Oct 2018 12:29:31 +0000 3Date: Sat, 27 Oct 2018 12:29:31 +0000
4Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to 4Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
diff --git a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch
deleted file mode 100644
index 5658b01a..00000000
--- a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 09b304966543753e445b90b904a9f558377a87f6 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Wed, 29 Aug 2018 18:20:14 +0900
4Subject: [PATCH] double-conversion: support AARCH64EB and arm BE
5
6Big endian can work well. So,
7- Make qtbase support aarch64 BE
8- Make qtbase support arm BE
9
10Upstream-Status: Pending
11
12Change-Id: Ie5b104fa2b23af8e89bae57fb56f3663be1bbb48
13Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 .../double-conversion/include/double-conversion/utils.h | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
20index ca7646d817..69aa17171c 100644
21--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
22+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
23@@ -68,7 +68,7 @@ inline void abort_noreturn() { abort(); }
24 // disabled.)
25 // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
26 #if defined(_M_X64) || defined(__x86_64__) || \
27- defined(__ARMEL__) || defined(__avr32__) || _M_ARM_FP || \
28+ defined(__arm__) || defined(__avr32__) || _M_ARM_FP || \
29 defined(__hppa__) || defined(__ia64__) || \
30 defined(__mips__) || \
31 defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
32@@ -76,7 +76,7 @@ inline void abort_noreturn() { abort(); }
33 defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
34 defined(__SH4__) || defined(__alpha__) || \
35 defined(_MIPS_ARCH_MIPS32R2) || \
36- defined(__AARCH64EL__) || defined(__aarch64__) || \
37+ defined(__AARCH64EL__) || defined(__AARCH64EB__) || defined(__aarch64__) || \
38 defined(__riscv)
39 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
40 #elif defined(__mc68000__)
diff --git a/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch
index c07cd2b8..10a7698e 100644
--- a/recipes-qt/qt5/qtbase/0018-corelib-Include-sys-types.h-for-uint32_t.patch
+++ b/recipes-qt/qt5/qtbase/0016-corelib-Include-sys-types.h-for-uint32_t.patch
@@ -1,4 +1,4 @@
1From dd16d19bc6b4e8ee5d61fae94cd65b7f10d6e835 Mon Sep 17 00:00:00 2001 1From 10d6966a88bdc997d2fdade463d267c25ba86f7d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 6 Dec 2018 11:47:52 -0800 3Date: Thu, 6 Dec 2018 11:47:52 -0800
4Subject: [PATCH] corelib: Include sys/types.h for uint32_t 4Subject: [PATCH] corelib: Include sys/types.h for uint32_t
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h 16diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h
17index 5f8a124bcc..fe1711cf1b 100644 17index 0a6db9afcd..b791d0a172 100644
18--- a/src/corelib/global/qnumeric_p.h 18--- a/src/corelib/global/qnumeric_p.h
19+++ b/src/corelib/global/qnumeric_p.h 19+++ b/src/corelib/global/qnumeric_p.h
20@@ -55,6 +55,7 @@ 20@@ -55,6 +55,7 @@
diff --git a/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
index 2ab04330..7144fbe4 100644
--- a/recipes-qt/qt5/qtbase/0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
+++ b/recipes-qt/qt5/qtbase/0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch
@@ -1,4 +1,4 @@
1From 61d8dd1cfdc6334a4d81c0f043a9515346872d0c Mon Sep 17 00:00:00 2001 1From c79578126a744dda2feeeff7521438714859508a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 6 Dec 2018 15:06:20 -0800 3Date: Thu, 6 Dec 2018 15:06:20 -0800
4Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux 4Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 1 file changed, 9 insertions(+) 13 1 file changed, 9 insertions(+)
14 14
15diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf 15diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
16index fdf3d1cdd3..6ecfd391f6 100644 16index c7ea20e180..8a6bb0052d 100644
17--- a/mkspecs/features/toolchain.prf 17--- a/mkspecs/features/toolchain.prf
18+++ b/mkspecs/features/toolchain.prf 18+++ b/mkspecs/features/toolchain.prf
19@@ -180,6 +180,13 @@ defineReplace(qtVariablesFromGCC) { 19@@ -210,6 +210,13 @@ defineReplace(qtVariablesFromGCC) {
20 return($$ret) 20 return($$ret)
21 } 21 }
22 22
@@ -30,12 +30,12 @@ index fdf3d1cdd3..6ecfd391f6 100644
30 isEmpty($${target_prefix}.COMPILER_MACROS) { 30 isEmpty($${target_prefix}.COMPILER_MACROS) {
31 msvc { 31 msvc {
32 clang_cl { 32 clang_cl {
33@@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) { 33@@ -229,6 +236,8 @@ isEmpty($${target_prefix}.COMPILER_MACROS) {
34 } else { 34 } else {
35 vars = $$qtVariablesFromMSVC($$QMAKE_CXX) 35 vars = $$qtVariablesFromMSVC($$QMAKE_CXX)
36 } 36 }
37+ } else: clang { 37+ } else: clang {
38+ vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS) 38+ vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS)
39 } else: gcc { 39 } else: gcc|ghs {
40 vars = $$qtVariablesFromGCC($$QMAKE_CXX) 40 vars = $$qtVariablesFromGCC($$QMAKE_CXX)
41 } 41 }
diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
index 42d94190..15ddbf31 100644
--- a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
1From 4ac36e3e40bd8a4940f211cf89155618149f1f68 Mon Sep 17 00:00:00 2001 1From 9caf072bfa7393a70714ce1e10169be4bfb8c866 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
diff --git a/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch
index ea79e392..69cbfa38 100644
--- a/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
1From 03c534e00991d08897541910226256e88f0f5efc Mon Sep 17 00:00:00 2001 1From b53e518a341d975298b804af6eb0d2f9a31abaf4 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 229b4d17a1..3dbb1ea65c 100644 16index dfcc3c9c7f..1e5bc401b7 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@@ -91,7 +91,7 @@ 19@@ -91,7 +91,7 @@
diff --git a/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch
deleted file mode 100644
index 2eb35600..00000000
--- a/recipes-qt/qt5/qtbase/0020-Fix-compile-issue-with-gcc-9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From eb68b9fa27d94bc90db5b0023b224ac0e60b8243 Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@qt.io>
3Date: Tue, 13 Nov 2018 16:00:23 +0100
4Subject: [PATCH] Fix compile issue with gcc 9
5
6It appears messenne_twisters in the latest libstdc++ has one more
7requirement before it is willing to construct with our
8SystemGenerator struct as an sseq provider.
9
10Upstream-Status: Backport from 5.12
11
12Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe
13Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
14Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
15Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16---
17 src/corelib/global/qrandom.cpp | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
21index ebf9864b15..577736a867 100644
22--- a/src/corelib/global/qrandom.cpp
23+++ b/src/corelib/global/qrandom.cpp
24@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator
25 #endif // Q_OS_WINRT
26
27 static SystemGenerator &self();
28+ typedef quint32 result_type;
29 void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
30
31 // For std::mersenne_twister_engine implementations that use something
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-13 18:18:02 +0000