diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase')
17 files changed, 91 insertions, 38 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 e49cd000..c22eb2e1 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 @@ -From 7aefc3b3351dd8a2b47dc8baa790ffde6fd1f158 Mon Sep 17 00:00:00 2001 +From a6f4987a281315dacc7b8b55928b9c0793cd0813 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -65,7 +65,7 @@ index 934a18a9249..0f5b1b63334 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index b57afcf72d7..afa1c39b3e9 100644 +index b57afcf72d..afa1c39b3e 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { @@ -103,7 +103,7 @@ index 1903e509c8e..c093dd4592d 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 00000000000..d90dfeb4482 +index 0000000000..f34a66599a --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,40 @@ @@ -139,7 +139,7 @@ index 00000000000..d90dfeb4482 +QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) +QMAKE_LINK_C = $$(OE_QMAKE_LINK) +QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) -+ ++QMAKE_CFLAGS_ISYSTEM = +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) + 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 3a219c1f..3e266ff4 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 @@ -From 4941648d4b26d625e86273d992697129209d8256 Mon Sep 17 00:00:00 2001 +From 2409068a4a7f51f12122629ed6ba043d872a6ff6 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [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 2450f7ef..4e5b02e6 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 @@ -From 1fce658543816f654c6b4abcf02b6190189ba3b7 Mon Sep 17 00:00:00 2001 +From 6d828cb28acc5b3fccc8ccc45b600c0f7c20201f Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the 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 141923df..2ed169f9 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 @@ -From 0dbc0d39c274f35415122d0b4d001da50d8e5355 Mon Sep 17 00:00:00 2001 +From d10cf6bb2b0c4637bd0df07c559fcdd461379b4d Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko <denys@ti.com> Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index 0512ef0144..8a53223a4e 100644 +index 6e7f6b76a4..35d15685ee 100644 --- a/configure.pri +++ b/configure.pri -@@ -817,10 +817,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -821,10 +821,10 @@ defineTest(qtConfOutput_preparePaths) { "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ "" \ "/* 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 24f966f5..0414af4e 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 @@ -From ffc59fc3f976db9008859857c2db1579b7784b57 Mon Sep 17 00:00:00 2001 +From fc51c10426c68137c57b5ea6c7ea2bdfe0055aaf Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out @@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 1211129283..f2c5b3a5a4 100644 +index 4039bba431..153edbfa30 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1265,7 +1265,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1266,7 +1266,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) } 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 537ff3f6..e2e31e86 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 @@ -From 78d36c322ca9d8d90a419b15febef4c11bf9066b Mon Sep 17 00:00:00 2001 +From f13bad486f825f88ec7757e1c5d2dbc849d9797a Mon Sep 17 00:00:00 2001 From: Pascal Bach <pascal.bach@siemens.com> Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [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 9b449d36..9b8f0096 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 @@ -From ee84c3b9cc8add6ee0c1a49c167b51f8d37230ae Mon Sep 17 00:00:00 2001 +From 7fc8b8c15007e0a1687680c66292d8ed55000053 Mon Sep 17 00:00:00 2001 From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [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 77b11a4b..6fac905d 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 @@ -From ef85b182bc1f2f6a337c6946fdbf3b37ade936cb Mon Sep 17 00:00:00 2001 +From 83965aee0017fb424406d895af5ec2cec696f26c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp -index c6fd5d17c2..7bf6bfd0e6 100644 +index e312199980..5789174ad5 100644 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp @@ -34,7 +34,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 3aa0d2dd..ca74f0f7 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 @@ -From 9a370262cce48a78b944a8d6e77257f915ab76e6 Mon Sep 17 00:00:00 2001 +From 51bc56305205a154db22c1373eb19d835ba2c64e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf new file mode 100644 -index 0000000000..ffc9f051db +index 0000000000..b0a5630fdd --- /dev/null +++ b/mkspecs/linux-oe-clang/qmake.conf @@ -0,0 +1,43 @@ @@ -52,7 +52,7 @@ index 0000000000..ffc9f051db +QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) +QMAKE_LINK_C = $$(OE_QMAKE_LINK) +QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) -+ ++QMAKE_CFLAGS_ISYSTEM = +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) + 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 5b8a10d6..ff7dceed 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 @@ -From c8840a63123e084cd5b2b3b8f10df72ed0ba2efb Mon Sep 17 00:00:00 2001 +From f5d4eed2a82b327130f3301ea5f8e56169df3dcf Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [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 cc82877e..1864ab8f 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 @@ -From 50c9fd7dc392ac4591c37bc3c97a6e48486e01b7 Mon Sep 17 00:00:00 2001 +From 5cbe22a0f46ab9bcdc5ff8d293ce925d94e951fd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp -index 375cecd521..46ca9b11cc 100644 +index b7cb8a1bdc..f6e6545948 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -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 1d6f3632..68d29346 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 @@ -From b41e0477f9b7aad73c94833dc750971a606871dc Mon Sep 17 00:00:00 2001 +From 9048b31285d643c52b4461bca646c91f1a5729d1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 14 Feb 2018 17:08:43 -0800 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem @@ -13,13 +13,29 @@ make[2]: *** [Makefile:11592: .obj/qgenericpluginfactory.o] Error 1 Upstream-Status: Pending +Change-Id: Ia47832a6339a6ee59c0a6301fc5e552cd28b1029 Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- + mkspecs/common/clang.conf | 2 +- mkspecs/common/gcc-base.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf +index 0fb84bc1b3..68b49b5303 100644 +--- a/mkspecs/common/clang.conf ++++ b/mkspecs/common/clang.conf +@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX + CONFIG += clang_pch_style + QMAKE_PCH_OUTPUT_EXT = .pch + +-QMAKE_CFLAGS_ISYSTEM = -isystem ++QMAKE_CFLAGS_ISYSTEM = + QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} + QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} + QMAKE_CFLAGS_LTCG = -flto diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index 234f71d495..ee3da023e6 100644 +index 234f71d495..c7d81a902e 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g @@ -27,7 +43,7 @@ index 234f71d495..ee3da023e6 100644 QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC -QMAKE_CFLAGS_ISYSTEM = -isystem -+QMAKE_CFLAGS_ISYSTEM = -I ++QMAKE_CFLAGS_ISYSTEM = QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions 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 index fcfb4e9e..c8240448 100644 --- 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 @@ -1,4 +1,4 @@ -From 1f9aefc7b4dee2f64ae64b72f7a20b139feb8440 Mon Sep 17 00:00:00 2001 +From d701e6ba0eccfb4d0e31cc33cf420020fbc870d1 Mon Sep 17 00:00:00 2001 From: Ulf Hermann <ulf.hermann@qt.io> Date: Fri, 27 Apr 2018 10:38:18 +0200 Subject: [PATCH] Upgrade double-conversion to v3.0.0 diff --git a/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch index e1e1087c..0f1e1b30 100644 --- a/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch +++ b/recipes-qt/qt5/qtbase/0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -1,4 +1,4 @@ -From 7e287f4793f75a7291386a904d3361460748b15b Mon Sep 17 00:00:00 2001 +From f63242fbcac990839eff2ce9f970377d6350fd8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Tue, 21 Aug 2018 00:29:06 +0200 Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped @@ -11,14 +11,14 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++ + src/corelib/io/qfilesystemengine_unix.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index be6ce48d0cb..1bf1bebc7f1 100644 +index deb4a9f220..ecf23168e7 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory(); +@@ -97,6 +97,17 @@ extern "C" NSString *NSTemporaryDirectory(); # define FICLONE _IOW(0x94, 9, int) #endif @@ -36,6 +36,3 @@ index be6ce48d0cb..1bf1bebc7f1 100644 # if defined(Q_OS_ANDROID) // renameat2() and statx() are disabled on Android because quite a few systems // come with sandboxes that kill applications that make system calls outside a --- -2.14.4 - 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 new file mode 100644 index 00000000..091fa812 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch @@ -0,0 +1,40 @@ +From 8fa67276c9cfb0002d5f4077f70ce2f477edbc4d Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Wed, 29 Aug 2018 18:20:14 +0900 +Subject: [PATCH] double-conversion: support AARCH64EB and arm BE + +Big endian can work well. So, +- Make qtbase support aarch64 BE +- Make qtbase support arm BE + +Upstream-Status: Pending + +Change-Id: Ie5b104fa2b23af8e89bae57fb56f3663be1bbb48 +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + .../double-conversion/include/double-conversion/utils.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index ca7646d817..69aa17171c 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -68,7 +68,7 @@ inline void abort_noreturn() { abort(); } + // disabled.) + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + #if defined(_M_X64) || defined(__x86_64__) || \ +- defined(__ARMEL__) || defined(__avr32__) || _M_ARM_FP || \ ++ defined(__arm__) || defined(__avr32__) || _M_ARM_FP || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +@@ -76,7 +76,7 @@ inline void abort_noreturn() { abort(); } + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) || defined(__aarch64__) || \ ++ defined(__AARCH64EL__) || defined(__AARCH64EB__) || defined(__aarch64__) || \ + defined(__riscv) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) diff --git a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch index 0a32e881..732e2fb7 100644 --- a/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 7ad41f69af974ec924eb27c86fb15d5da9384d6c Mon Sep 17 00:00:00 2001 +From 7b5433027e9c75902b83a2990e09ae221d98451e Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen @@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.pro b/src/src.pro -index 1f7c5d99c1..6b39379dd0 100644 +index 1c76a2e46f..fbd4014fb3 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -222,7 +222,7 @@ qtConfig(gui) { +@@ -232,7 +232,7 @@ qtConfig(gui) { } } } diff --git a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch index 4f5fdc95..66dc8404 100644 --- a/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 +From 739dd4920bc16919c81c62bcddadc6958599792c Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature |