diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase')
21 files changed, 41 insertions, 41 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 872212f6..a8d85346 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 @@ | |||
1 | From 45fbe12b5cff5825e078f731c2e8e3d294b9a1d2 Mon Sep 17 00:00:00 2001 | 1 | From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH] Add linux-oe-g++ platform | 4 | Subject: [PATCH] Add linux-oe-g++ platform |
@@ -31,10 +31,10 @@ 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 | ||
33 | diff --git a/configure b/configure | 33 | diff --git a/configure b/configure |
34 | index 6657870e4b..2f5d9a21ef 100755 | 34 | index b6c9b462f2..4e3fcd41d1 100755 |
35 | --- a/configure | 35 | --- a/configure |
36 | +++ b/configure | 36 | +++ b/configure |
37 | @@ -711,7 +711,7 @@ fi | 37 | @@ -708,7 +708,7 @@ fi |
38 | # is where the resulting variable is written to | 38 | # is where the resulting variable is written to |
39 | setBootstrapVariable() | 39 | setBootstrapVariable() |
40 | { | 40 | { |
@@ -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) |
67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | 67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf |
68 | index 3a71376029..dd6020f1fe 100644 | 68 | index 99b7fe6562..1ddfddb2bd 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 | @@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { | 71 | @@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { |
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 7cbe46ed..dbd527ac 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 @@ | |||
1 | From f05a53357489590c3cd8cd848a34f3aeb4bebe18 Mon Sep 17 00:00:00 2001 | 1 | From 826dbd9eac2b99c25e3e97f210eec3eef90941da Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS | 4 | Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS |
@@ -72,7 +72,7 @@ index a814678f7b..8546e4b4dc 100644 | |||
72 | _qt5_DBus_check_file_exists(${imported_location}) | 72 | _qt5_DBus_check_file_exists(${imported_location}) |
73 | 73 | ||
74 | diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in | 74 | diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in |
75 | index 236d1d4159..f25a73a78b 100644 | 75 | index 83d8004a08..d0651ee44b 100644 |
76 | --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in | 76 | --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in |
77 | +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in | 77 | +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in |
78 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) | 78 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic) |
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 3fb6bc87..78784935 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 @@ | |||
1 | From ea0973fb18ca76d292b3c7fb7a29be547f6d95e1 Mon Sep 17 00:00:00 2001 | 1 | From 64518ca83c405b8666739909f0c9daba4928f070 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the | 4 | Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the |
@@ -20,7 +20,7 @@ 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 | ||
22 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 22 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
23 | index 835fea0c77..dea00e28b9 100644 | 23 | index f1d7832e46..312fd2b0c8 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 | @@ -183,7 +183,10 @@ void QLibrarySettings::load() | 26 | @@ -183,7 +183,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 3a223c2c..f91792c0 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 @@ | |||
1 | From f83f21998ba43dcdb02de360ba9997f909c5d677 Mon Sep 17 00:00:00 2001 | 1 | From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 | 3 | Date: Tue, 25 Aug 2015 10:05:15 -0400 |
4 | Subject: [PATCH] configure: bump path length from 256 to 512 characters | 4 | Subject: [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 e1536f40..703a3d9c 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 @@ | |||
1 | From 6e0bfe33f74f4a24d7f4c9adb5b96ca6ae844308 Mon Sep 17 00:00:00 2001 | 1 | From 018b5507d9f01db2d408aaecffb837d283e9e36a Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Mon, 24 Oct 2016 09:45:18 +0300 | 3 | Date: Mon, 24 Oct 2016 09:45:18 +0300 |
4 | Subject: [PATCH] Disable all unknown features instead of erroring out | 4 | Subject: [PATCH] Disable all unknown features instead of erroring out |
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 b4f253e7..bfaca2b1 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 @@ | |||
1 | From 0a279228c6a3eb52e434aeb31504762dd29e2f5f Mon Sep 17 00:00:00 2001 | 1 | From 9ccf2216dae8288a31824dad570cf63443d0e66d Mon Sep 17 00:00:00 2001 |
2 | From: Pascal Bach <pascal.bach@siemens.com> | 2 | From: Pascal Bach <pascal.bach@siemens.com> |
3 | Date: Wed, 11 May 2016 15:20:41 +0200 | 3 | Date: Wed, 11 May 2016 15:20:41 +0200 |
4 | Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS | 4 | Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS |
@@ -30,10 +30,10 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com> | |||
30 | 2 files changed, 10 insertions(+) | 30 | 2 files changed, 10 insertions(+) |
31 | 31 | ||
32 | diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 32 | diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in |
33 | index 4c3086a1f6..f330d28448 100644 | 33 | index 309798a767..d9a83cf6db 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 | @@ -2,6 +2,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 | message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") |
38 | endif() | 38 | endif() |
39 | 39 | ||
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 a8161770..55c9ad78 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 @@ | |||
1 | From bc9aa54b9930635ddceb918bfc94871e2fc3d413 Mon Sep 17 00:00:00 2001 | 1 | From 43394997b285f11450dc2c2b7184d730c2fba30b Mon Sep 17 00:00:00 2001 |
2 | From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2 | From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> |
3 | Date: Wed, 7 Jun 2017 21:00:49 +0900 | 3 | Date: Wed, 7 Jun 2017 21:00:49 +0900 |
4 | Subject: [PATCH] Delete qlonglong and qulonglong | 4 | 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 1dbb2855..4353d43e 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 @@ | |||
1 | From fbe7fd996b86c087d64864bcce154d382701ab6f Mon Sep 17 00:00:00 2001 | 1 | From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 27 Jul 2017 08:02:51 -0700 | 3 | Date: Thu, 27 Jul 2017 08:02:51 -0700 |
4 | Subject: [PATCH] Replace pthread_yield with sched_yield | 4 | Subject: [PATCH] Replace pthread_yield with sched_yield |
@@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644 | |||
36 | QMetaType info(tp); | 36 | QMetaType info(tp); |
37 | if (!info.isValid()) { | 37 | if (!info.isValid()) { |
38 | diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 38 | diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp |
39 | index 099aa5fb51..c2d310458e 100644 | 39 | index 6dd390ccbd..43b92606d9 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 f5e21333..632c1cc8 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 @@ | |||
1 | From ed82988ac6aca8c6927211edefa4e548cc284dfd Mon Sep 17 00:00:00 2001 | 1 | From 7fb3964a19710834d4eb700c538015b8234af347 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Sep 2017 09:11:44 -0700 | 3 | Date: Sun, 3 Sep 2017 09:11:44 -0700 |
4 | Subject: [PATCH] Add OE specific specs for clang compiler | 4 | Subject: [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 a0b882ca..5372ec3e 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 @@ | |||
1 | From 1d03a7f53ca07ffcee37ec2a6606435c18585ce7 Mon Sep 17 00:00:00 2001 | 1 | From df227467c195289a779f45a33be9dd32d1786ffe Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Sep 2017 09:44:48 -0700 | 3 | Date: Sun, 3 Sep 2017 09:44:48 -0700 |
4 | Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T | 4 | 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 f579cb5a..dfac71f7 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 @@ | |||
1 | From 146fcda8319f17e01af676ee4151d83f302c6d6e Mon Sep 17 00:00:00 2001 | 1 | From 5cdbde95e65bf641dda1a74711fd67b3237fb410 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Sep 2017 10:11:50 -0700 | 3 | Date: Sun, 3 Sep 2017 10:11:50 -0700 |
4 | Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc | 4 | Subject: [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 | ||
13 | diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 13 | diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
14 | index ec85a6c5c6..15bf7d106f 100644 | 14 | index 11ba032d82..027aef00fd 100644 |
15 | --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 15 | --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
16 | +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 16 | +++ b/tests/auto/corelib/text/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 a35746c6..147e304d 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 @@ | |||
1 | From 3184d1f75e0312826efd1227519b46b5cb464299 Mon Sep 17 00:00:00 2001 | 1 | From 47d2068fa96173b68bcbc45a80a66d7c9cbf4775 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 14 Feb 2018 17:08:43 -0800 | 3 | Date: Wed, 14 Feb 2018 17:08:43 -0800 |
4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem | 4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem |
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index fa348096..4f4ed837 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bbf475d3c2415a78a8701bd3acaf69032721d597 Mon Sep 17 00:00:00 2001 | 1 | From be570ecd63da95a11428552723519393cc0cb53e Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Tue, 23 Oct 2018 09:54:57 +0300 | 3 | Date: Tue, 23 Oct 2018 09:54:57 +0300 |
4 | Subject: [PATCH] Disable ltcg for host_build | 4 | Subject: [PATCH] Disable ltcg for host_build |
diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index 59fd70b0..86148aee 100644 --- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 44e4a803fd41ff975cdd6c90afa4be66396e14a4 Mon Sep 17 00:00:00 2001 | 1 | From 261a2abc536391dadd9e799c3ee32d31ab140d15 Mon Sep 17 00:00:00 2001 |
2 | From: Max Krummenacher <max.krummenacher@toradex.com> | 2 | From: Max Krummenacher <max.krummenacher@toradex.com> |
3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 | 3 | Date: Sat, 27 Oct 2018 12:29:31 +0000 |
4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to | 4 | Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to |
diff --git a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch index dbad9cf6..76e75ac8 100644 --- a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch +++ b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 54936e8ad2e9329edacc6e8150087d463c14fac4 Mon Sep 17 00:00:00 2001 | 1 | From c09fe6a87c444dc20b93334a9530d5bfd9ab03ff Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 6 Dec 2018 11:47:52 -0800 | 3 | Date: Thu, 6 Dec 2018 11:47:52 -0800 |
4 | Subject: [PATCH] corelib: Include sys/types.h for uint32_t | 4 | Subject: [PATCH] corelib: Include sys/types.h for uint32_t |
diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch index 138cbad3..2333b4a1 100644 --- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d45c22d639c58d20a15ffc70c28a00e800c12bf4 Mon Sep 17 00:00:00 2001 | 1 | From a83f643bfea108dda725a7b0c7eb8c957004466f Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 6 Dec 2018 15:06:20 -0800 | 3 | Date: Thu, 6 Dec 2018 15:06:20 -0800 |
4 | Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux | 4 | Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux |
diff --git a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch index 133c43bb..341be6ad 100644 --- a/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch +++ b/recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b9b6172194de411c2c68e81c427a79b0a1227e3e Mon Sep 17 00:00:00 2001 | 1 | From 8e9c933cad3bd044b432b5557cf47a9ffea4e318 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 25 Nov 2019 08:27:39 -0800 | 3 | Date: Mon, 25 Nov 2019 08:27:39 -0800 |
4 | Subject: [PATCH] input: Make use of timeval portable for 64bit time_t | 4 | Subject: [PATCH] input: Make use of timeval portable for 64bit time_t |
diff --git a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch index e9e29941..c032ec03 100644 --- a/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch +++ b/recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f2da5661a2a8bc2037a4d40fd1db16522af6d7a8 Mon Sep 17 00:00:00 2001 | 1 | From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001 |
2 | From: Nicola Lunghi <nick83ola@gmail.com> | 2 | From: Nicola Lunghi <nick83ola@gmail.com> |
3 | Date: Wed, 5 Feb 2020 15:32:25 +0000 | 3 | Date: Wed, 5 Feb 2020 15:32:25 +0000 |
4 | Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform | 4 | Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform |
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894 | |||
13 | 1 file changed, 37 insertions(+), 13 deletions(-) | 13 | 1 file changed, 37 insertions(+), 13 deletions(-) |
14 | 14 | ||
15 | diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 15 | diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp |
16 | index 9eb62ceab2..211151876c 100644 | 16 | index 45798cc527..de3f156cae 100644 |
17 | --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 17 | --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp |
18 | +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 18 | +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp |
19 | @@ -2893,19 +2893,43 @@ void tst_QPainter::monoImages() | 19 | @@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages() |
20 | #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) | 20 | #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) |
21 | #include <fenv.h> | 21 | #include <fenv.h> |
22 | 22 | ||
@@ -67,7 +67,7 @@ index 9eb62ceab2..211151876c 100644 | |||
67 | return QLatin1String("Invalid operation"); | 67 | return QLatin1String("Invalid operation"); |
68 | return QLatin1String("No exception"); | 68 | return QLatin1String("No exception"); |
69 | } | 69 | } |
70 | @@ -2931,7 +2955,7 @@ private: | 70 | @@ -2932,7 +2956,7 @@ private: |
71 | 71 | ||
72 | void fpe_rasterizeLine_task232012() | 72 | void fpe_rasterizeLine_task232012() |
73 | { | 73 | { |
@@ -76,7 +76,7 @@ index 9eb62ceab2..211151876c 100644 | |||
76 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); | 76 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); |
77 | img.fill(0x0); | 77 | img.fill(0x0); |
78 | QPainter p(&img); | 78 | QPainter p(&img); |
79 | @@ -2943,7 +2967,7 @@ void fpe_rasterizeLine_task232012() | 79 | @@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012() |
80 | 80 | ||
81 | void fpe_pixmapTransform() | 81 | void fpe_pixmapTransform() |
82 | { | 82 | { |
@@ -85,7 +85,7 @@ index 9eb62ceab2..211151876c 100644 | |||
85 | 85 | ||
86 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); | 86 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); |
87 | 87 | ||
88 | @@ -2971,7 +2995,7 @@ void fpe_pixmapTransform() | 88 | @@ -2972,7 +2996,7 @@ void fpe_pixmapTransform() |
89 | 89 | ||
90 | void fpe_zeroLengthLines() | 90 | void fpe_zeroLengthLines() |
91 | { | 91 | { |
@@ -94,7 +94,7 @@ index 9eb62ceab2..211151876c 100644 | |||
94 | 94 | ||
95 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); | 95 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); |
96 | 96 | ||
97 | @@ -2983,7 +3007,7 @@ void fpe_zeroLengthLines() | 97 | @@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines() |
98 | 98 | ||
99 | void fpe_divByZero() | 99 | void fpe_divByZero() |
100 | { | 100 | { |
@@ -103,7 +103,7 @@ index 9eb62ceab2..211151876c 100644 | |||
103 | 103 | ||
104 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); | 104 | QImage img(128, 128, QImage::Format_ARGB32_Premultiplied); |
105 | 105 | ||
106 | @@ -3006,7 +3030,7 @@ void fpe_divByZero() | 106 | @@ -3007,7 +3031,7 @@ void fpe_divByZero() |
107 | 107 | ||
108 | void fpe_steepSlopes() | 108 | void fpe_steepSlopes() |
109 | { | 109 | { |
@@ -112,7 +112,7 @@ index 9eb62ceab2..211151876c 100644 | |||
112 | 112 | ||
113 | QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); | 113 | QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied); |
114 | 114 | ||
115 | @@ -3025,7 +3049,7 @@ void fpe_steepSlopes() | 115 | @@ -3026,7 +3050,7 @@ void fpe_steepSlopes() |
116 | 116 | ||
117 | void fpe_radialGradients() | 117 | void fpe_radialGradients() |
118 | { | 118 | { |
diff --git a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch index 5d5a32d7..8a112ced 100644 --- a/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ecfccd0a25564555253f9f09fa6bed85973020a4 Mon Sep 17 00:00:00 2001 | 1 | From 6a7c34194c6bbb53c2b13375db3cb2d6a9aabe31 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH] Always build uic and qvkgen | 4 | Subject: [PATCH] Always build uic and qvkgen |
@@ -14,10 +14,10 @@ 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 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index 592f0cf644..e1cfc3901f 100644 | 17 | index 6658cbc9e0..d4a0e68e8d 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -235,7 +235,7 @@ qtConfig(gui) { | 20 | @@ -242,7 +242,7 @@ qtConfig(gui) { |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
diff --git a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch index aba0d502..f8699cfd 100644 --- a/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f2324ba65bb667108a8ad2f08bc4e4b08253e38b Mon Sep 17 00:00:00 2001 | 1 | From db1700a72d62f7b8686f94cf262d96171c298f5f Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
3 | Date: Sun, 14 Apr 2019 13:27:58 +0200 | 3 | Date: Sun, 14 Apr 2019 13:27:58 +0200 |
4 | Subject: [PATCH] Avoid renameeat2 for native(sdk) builds | 4 | Subject: [PATCH] Avoid renameeat2 for native(sdk) builds |
@@ -46,7 +46,7 @@ index b3daf43c04..e1df2ac580 100644 | |||
46 | # define QT_FEATURE_statx -1 | 46 | # define QT_FEATURE_statx -1 |
47 | #endif | 47 | #endif |
48 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | 48 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp |
49 | index eaf4e2d9af..63f2f8ecb3 100644 | 49 | index 67cff7c68c..86e45320d5 100644 |
50 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | 50 | --- a/src/corelib/io/qfilesystemengine_unix.cpp |
51 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | 51 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp |
52 | @@ -1435,16 +1435,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy | 52 | @@ -1435,16 +1435,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy |
diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch index 68193991..a8169a69 100644 --- a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6d2382ba56e9d2362ff3572356911f3ef1d6eaef Mon Sep 17 00:00:00 2001 | 1 | From 0422ea8555c7d42e2e3091e1f5ee9fe172b6a89f Mon Sep 17 00:00:00 2001 |
2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 | 3 | Date: Fri, 24 Nov 2017 15:16:31 +0200 |
4 | Subject: [PATCH] Bootstrap without linkat feature | 4 | Subject: [PATCH] Bootstrap without linkat feature |