diff options
24 files changed, 71 insertions, 69 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 165aa562..bac10639 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -22,8 +22,8 @@ require qt5-git.inc | |||
22 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" | 22 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" |
23 | 23 | ||
24 | # common for qtbase-native, qtbase-nativesdk and qtbase | 24 | # common for qtbase-native, qtbase-nativesdk and qtbase |
25 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared | 25 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared |
26 | # 5.13.meta-qt5-shared.1 | 26 | # 5.14.meta-qt5-shared.1 |
27 | SRC_URI += "\ | 27 | SRC_URI += "\ |
28 | file://0001-Add-linux-oe-g-platform.patch \ | 28 | file://0001-Add-linux-oe-g-platform.patch \ |
29 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 29 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
@@ -46,11 +46,11 @@ SRC_URI += "\ | |||
46 | " | 46 | " |
47 | 47 | ||
48 | # common for qtbase-native and nativesdk-qtbase | 48 | # common for qtbase-native and nativesdk-qtbase |
49 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native | 49 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native |
50 | # 5.13.meta-qt5-native.1 | 50 | # 5.14.meta-qt5-native.1 |
51 | SRC_URI += " \ | 51 | SRC_URI += " \ |
52 | file://0018-Always-build-uic-and-qvkgen.patch \ | 52 | file://0019-Always-build-uic-and-qvkgen.patch \ |
53 | file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ | 53 | file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ |
54 | " | 54 | " |
55 | 55 | ||
56 | # CMake's toolchain configuration of nativesdk-qtbase | 56 | # CMake's toolchain configuration of nativesdk-qtbase |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 154740ee..37034b94 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -17,8 +17,8 @@ require qt5-native.inc | |||
17 | require qt5-git.inc | 17 | require qt5-git.inc |
18 | 18 | ||
19 | # common for qtbase-native, qtbase-nativesdk and qtbase | 19 | # common for qtbase-native, qtbase-nativesdk and qtbase |
20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared | 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared |
21 | # 5.13.meta-qt5-shared.1 | 21 | # 5.14.meta-qt5-shared.1 |
22 | SRC_URI += "\ | 22 | SRC_URI += "\ |
23 | file://0001-Add-linux-oe-g-platform.patch \ | 23 | file://0001-Add-linux-oe-g-platform.patch \ |
24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
@@ -41,16 +41,16 @@ SRC_URI += "\ | |||
41 | " | 41 | " |
42 | 42 | ||
43 | # common for qtbase-native and nativesdk-qtbase | 43 | # common for qtbase-native and nativesdk-qtbase |
44 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-native | 44 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-native |
45 | # 5.13.meta-qt5-native.1 | 45 | # 5.14.meta-qt5-native.1 |
46 | SRC_URI += " \ | 46 | SRC_URI += " \ |
47 | file://0018-Always-build-uic-and-qvkgen.patch \ | 47 | file://0019-Always-build-uic-and-qvkgen.patch \ |
48 | file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ | 48 | file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ |
49 | " | 49 | " |
50 | 50 | ||
51 | # only for qtbase-native | 51 | # only for qtbase-native |
52 | SRC_URI += " \ | 52 | SRC_URI += " \ |
53 | file://0020-Bootstrap-without-linkat-feature.patch \ | 53 | file://0021-Bootstrap-without-linkat-feature.patch \ |
54 | " | 54 | " |
55 | 55 | ||
56 | CLEANBROKEN = "1" | 56 | CLEANBROKEN = "1" |
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 02043ea0..3b71adad 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 4310d415fd53a1c41b838dafc3913b61087bd799 Mon Sep 17 00:00:00 2001 | 1 | From 5668523aa073c1ef430b1662c735ead8fd64c83b 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 ef7bad1bfc..dcca0f9135 100755 | 34 | index 6657870e4b..2f5d9a21ef 100755 |
35 | --- a/configure | 35 | --- a/configure |
36 | +++ b/configure | 36 | +++ b/configure |
37 | @@ -712,7 +712,7 @@ fi | 37 | @@ -711,7 +711,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 | { |
@@ -89,10 +89,10 @@ index 3a71376029..dd6020f1fe 100644 | |||
89 | # run qmlimportscanner | 89 | # run qmlimportscanner |
90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) | 90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) |
91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
92 | index 1903e509c8..c093dd4592 100644 | 92 | index 661b7dd961..3bc73ab0c6 100644 |
93 | --- a/mkspecs/features/qt_functions.prf | 93 | --- a/mkspecs/features/qt_functions.prf |
94 | +++ b/mkspecs/features/qt_functions.prf | 94 | +++ b/mkspecs/features/qt_functions.prf |
95 | @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { | 95 | @@ -76,7 +76,7 @@ defineTest(qtHaveModule) { |
96 | defineTest(qtPrepareTool) { | 96 | defineTest(qtPrepareTool) { |
97 | cmd = $$eval(QT_TOOL.$${2}.binary) | 97 | cmd = $$eval(QT_TOOL.$${2}.binary) |
98 | isEmpty(cmd) { | 98 | isEmpty(cmd) { |
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 abef9c2e..1a5adcaf 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 c15b17e7289f7f17e30972c814e565e4a3c1c629 Mon Sep 17 00:00:00 2001 | 1 | From b0e51c74e3f550c2d72ee4e02d1f9c3f5d2e83b5 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 |
@@ -19,7 +19,7 @@ Change-Id: Iacaa1c5531cd6dcc094891610c351673db55d7b2 | |||
19 | 3 files changed, 6 insertions(+), 6 deletions(-) | 19 | 3 files changed, 6 insertions(+), 6 deletions(-) |
20 | 20 | ||
21 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 21 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
22 | index e0652fdcf9..7b8fed8931 100644 | 22 | index 9b672327ef..f0820b4f4e 100644 |
23 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 23 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
24 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 24 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
25 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 25 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 4428efda..6891d8c4 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 4ec7f7cb5b8779e50af4a3fe282e02f225f13ddf Mon Sep 17 00:00:00 2001 | 1 | From db95ec35c5e2a1604f82803fc5c09dc82b594175 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,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 | ||
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 f2ada4ab30..62c6feae17 100644 | 23 | index f0f77fe68e..8ef04cb64f 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 | @@ -174,7 +174,10 @@ void QLibrarySettings::load() | 26 | @@ -183,7 +183,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 6157a52c..25c3a66e 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 b7856b64c4273c25d3f9a0873632595151652c91 Mon Sep 17 00:00:00 2001 | 1 | From 3fa9db42f3b34f97929662a461c9a07982505178 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 |
@@ -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 | ||
17 | diff --git a/configure.pri b/configure.pri | 17 | diff --git a/configure.pri b/configure.pri |
18 | index 3778ece180..94bdfd2649 100644 | 18 | index 47882afeb6..a50aa0e176 100644 |
19 | --- a/configure.pri | 19 | --- a/configure.pri |
20 | +++ b/configure.pri | 20 | +++ b/configure.pri |
21 | @@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) { | 21 | @@ -870,10 +870,10 @@ defineTest(qtConfOutput_preparePaths) { |
22 | 22 | ||
23 | $${currentConfig}.output.qconfigSource = \ | 23 | $${currentConfig}.output.qconfigSource = \ |
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 79125fc6..c27f7ac2 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 50f0c25c0d45928a88a4a2c5a3484e6159f8580a Mon Sep 17 00:00:00 2001 | 1 | From 1ca3511433c55755c63dfa0fb78d712c6605b37a 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 |
@@ -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 | ||
12 | diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf | 12 | diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf |
13 | index 81110e9f6d..e6b4eeeb11 100644 | 13 | index 6537d98c5d..06d23e3847 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 | @@ -1604,7 +1604,8 @@ defineReplace(qtConfEvaluateSingleExpression) { | 16 | @@ -1544,7 +1544,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 abc1cf31..03931f5c 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 11a7d56a5f57a13643bee171f80d9c4d80b2790b Mon Sep 17 00:00:00 2001 | 1 | From 37f7cae8d723341b12fe76bca12c4c76d98fb874 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,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 | ||
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 f4a34d6e48..416f1b13bb 100644 | 33 | index 364c23e750..670b5c71f2 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 29c566fc..1a1d696f 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 de968b7efc0248052eb96ce430e216a6dfec60d2 Mon Sep 17 00:00:00 2001 | 1 | From 2b0adcafba19d87ef452dad156c8fda8ec8396b0 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 1c33a51f..fe3e0754 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 a12d09f70178952f5be68110714386a0be00b017 Mon Sep 17 00:00:00 2001 | 1 | From 98fbf9fcbe29886dbc84a7e95a9f58a588a8e8ea 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 |
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 2 files changed, 5 insertions(+), 4 deletions(-) | 14 | 2 files changed, 5 insertions(+), 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp | 16 | diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp |
17 | index e2bb7dab2a..683c7bafcd 100644 | 17 | index 12c29a6e13..7d31799da6 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 | @@ -35,7 +35,7 @@ | 20 | @@ -35,7 +35,7 @@ |
@@ -36,7 +36,7 @@ index e2bb7dab2a..683c7bafcd 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 10b09629bc..858fc5fc99 100644 | 39 | index 75b9b23259..77b5bf1525 100644 |
40 | --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 40 | --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp |
41 | +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 41 | +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp |
42 | @@ -78,6 +78,7 @@ | 42 | @@ -78,6 +78,7 @@ |
@@ -47,7 +47,7 @@ index 10b09629bc..858fc5fc99 100644 | |||
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #include "private/qhostinfo_p.h" | 49 | #include "private/qhostinfo_p.h" |
50 | @@ -2151,8 +2152,8 @@ public slots: | 50 | @@ -2177,8 +2178,8 @@ public slots: |
51 | 51 | ||
52 | #if defined(Q_OS_MAC) | 52 | #if defined(Q_OS_MAC) |
53 | pthread_yield_np(); | 53 | pthread_yield_np(); |
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index a0120a4a..fd2716ec 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 69999f5af72d090ec5ddd7003e099af5dfb448ac Mon Sep 17 00:00:00 2001 | 1 | From 46b07eaf67735ad21b56c67a61737491c1150760 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 fec487a6..b9c95c5e 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 82111f824764051266d0b807ab3c61bf13b1056a Mon Sep 17 00:00:00 2001 | 1 | From df0f6f03af2494d7dc73035273e0a7e65780f3d7 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 d5c23c38..bd835f1e 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 78d1a6005263f3a7d2dd4ce22f13d3d35b3c6c2f Mon Sep 17 00:00:00 2001 | 1 | From fab74db07a1f4f7502d37c4f4c2a04f540dbe6a5 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 676c66d..ba05aad 100644 | 14 | index 20ed7500b5..90181fd078 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 1f1ec8bd..c5a2a67f 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 f01d43195be86fb5b06ad042551d65c54e34425a Mon Sep 17 00:00:00 2001 | 1 | From 716d70f9ac91725155f7e6c14727ab86fbdf44f4 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 |
@@ -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 | ||
24 | diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf | 24 | diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf |
25 | index df210fe42d..79a3ddf2f8 100644 | 25 | index aead581478..8e06a069b4 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 | @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch | 28 | @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch |
@@ -35,7 +35,7 @@ index df210fe42d..79a3ddf2f8 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=thin | 36 | QMAKE_CFLAGS_LTCG = -flto=thin |
37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf | 37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf |
38 | index 44b4267207..9756a02014 100644 | 38 | index 4d82321cba..0b03ec99a6 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/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index 34e41a18..6797e903 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 7804eb38b11b3a03217a6505d4b64c335d5a1d0d Mon Sep 17 00:00:00 2001 | 1 | From 63cf72b8519dd58a5fb6eeeef67b19842806cddc 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 |
@@ -15,7 +15,7 @@ Upstream-Status: Inappropriate [embedded specific] | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf | 17 | diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf |
18 | index a94f6d0eeb..ccab725843 100644 | 18 | index d81f340edd..dc1d196710 100644 |
19 | --- a/mkspecs/features/ltcg.prf | 19 | --- a/mkspecs/features/ltcg.prf |
20 | +++ b/mkspecs/features/ltcg.prf | 20 | +++ b/mkspecs/features/ltcg.prf |
21 | @@ -1,6 +1,6 @@ | 21 | @@ -1,6 +1,6 @@ |
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 8f0568ad..91f12f64 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 e8d9ebf65245a7ca17bdc3f1ed313c60736e7c9b Mon Sep 17 00:00:00 2001 | 1 | From 5630158766df351317ead6059ca7039cd125ab27 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 78b13ddd..2906e763 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 1dbee5ad3c0bc44c4c208ac27448535ef412a0ea Mon Sep 17 00:00:00 2001 | 1 | From a1508aff41a526b900f958831a1196f2655c57e9 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 |
@@ -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 | ||
16 | diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h | 16 | diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h |
17 | index 4a225b2599..4414865c71 100644 | 17 | index 86e7997680..73bcd370c2 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/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 d30f335f..eff1e0b2 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 6ba1d79754bea482b2ac5ae2bb3e60681d435d37 Mon Sep 17 00:00:00 2001 | 1 | From e983e9e5451d6961a11206360aeae599f090f971 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-qfloat16-check-for-__ARM_FP-2.patch b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch index 8411b83d..ebaa7b65 100644 --- a/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch +++ b/recipes-qt/qt5/qtbase/0017-qfloat16-check-for-__ARM_FP-2.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b938d809624660a2998ea7f844aba715e40acfc6 Mon Sep 17 00:00:00 2001 | 1 | From a0f5ac48354dd86aaa53c07e08e30098c62f5097 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: Sat, 5 Oct 2019 16:21:08 -0700 | 3 | Date: Sat, 5 Oct 2019 16:21:08 -0700 |
4 | Subject: [PATCH] qfloat16: check for __ARM_FP & 2 | 4 | Subject: [PATCH] qfloat16: check for __ARM_FP & 2 |
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp | 22 | diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp |
23 | index 87ff796368..37dec371a6 100644 | 23 | index 6c21b7de5a..98d34a96a5 100644 |
24 | --- a/src/corelib/global/qfloat16.cpp | 24 | --- a/src/corelib/global/qfloat16.cpp |
25 | +++ b/src/corelib/global/qfloat16.cpp | 25 | +++ b/src/corelib/global/qfloat16.cpp |
26 | @@ -148,7 +148,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype | 26 | @@ -205,7 +205,7 @@ f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype |
27 | #undef f16cextern | 27 | #undef f16cextern |
28 | } | 28 | } |
29 | 29 | ||
diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch index c027fb68..7a5c7754 100644 --- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch +++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c200c1704501e5a74f72dedc3b3b76567d679e0d Mon Sep 17 00:00:00 2001 | 1 | From b83804eb1f9087800295cf40916577f932673dc8 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 |
@@ -10,11 +10,13 @@ and keeps old input.h implementation functional as well. | |||
10 | See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign | 10 | See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign |
11 | Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] | 11 | Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/282610] |
12 | Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 | 12 | Change-Id: Ie4d66a5e7d83065f1a904a542c711431e1d20845 |
13 | |||
14 | --- | 13 | --- |
14 | .../input/evdevkeyboard/qevdevkeyboardhandler.cpp | 10 +++++++++- | ||
15 | .../input/evdevtouch/qevdevtouchhandler.cpp | 7 ++++++- | ||
16 | 2 files changed, 15 insertions(+), 2 deletions(-) | ||
15 | 17 | ||
16 | diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | 18 | diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp |
17 | index 3555763..e7dc57c 100644 | 19 | index 3555763b89..e7dc57c027 100644 |
18 | --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | 20 | --- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp |
19 | +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp | 21 | +++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp |
20 | @@ -58,6 +58,11 @@ | 22 | @@ -58,6 +58,11 @@ |
@@ -29,7 +31,7 @@ index 3555763..e7dc57c 100644 | |||
29 | QT_BEGIN_NAMESPACE | 31 | QT_BEGIN_NAMESPACE |
30 | 32 | ||
31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") | 33 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") |
32 | @@ -150,7 +155,10 @@ | 34 | @@ -150,7 +155,10 @@ void QEvdevKeyboardHandler::switchLed(int led, bool state) |
33 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); | 35 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); |
34 | 36 | ||
35 | struct ::input_event led_ie; | 37 | struct ::input_event led_ie; |
@@ -42,7 +44,7 @@ index 3555763..e7dc57c 100644 | |||
42 | led_ie.code = led; | 44 | led_ie.code = led; |
43 | led_ie.value = state; | 45 | led_ie.value = state; |
44 | diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 46 | diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
45 | index 78728ef..1d65f9b 100644 | 47 | index c51db59e1f..1f3726e291 100644 |
46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 48 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 49 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
48 | @@ -58,6 +58,11 @@ | 50 | @@ -58,6 +58,11 @@ |
@@ -57,7 +59,7 @@ index 78728ef..1d65f9b 100644 | |||
57 | #include <math.h> | 59 | #include <math.h> |
58 | 60 | ||
59 | #if QT_CONFIG(mtdev) | 61 | #if QT_CONFIG(mtdev) |
60 | @@ -573,7 +578,7 @@ | 62 | @@ -576,7 +581,7 @@ void QEvdevTouchScreenData::processInputEvent(input_event *data) |
61 | 63 | ||
62 | // update timestamps | 64 | // update timestamps |
63 | m_lastTimeStamp = m_timeStamp; | 65 | m_lastTimeStamp = m_timeStamp; |
diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch index 2ebab22b..86dfac2c 100644 --- a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0019-Always-build-uic-and-qvkgen.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 86effd1f524ebe13d3c288e5ccd1bd477508c0d0 Mon Sep 17 00:00:00 2001 | 1 | From eff8ae2d5748626dfd173fa6cb5860bb72ffeafa 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 ce3db6d783..2bd15f57d9 100644 | 17 | index 8ff3ec4c1f..7a26fd3596 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -231,7 +231,7 @@ qtConfig(gui) { | 20 | @@ -235,7 +235,7 @@ qtConfig(gui) { |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0020-Avoid-renameeat2-for-native-sdk-builds.patch index 2393673f..bde4f76c 100644 --- a/recipes-qt/qt5/qtbase/0019-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 0ee2fc2de566efc5ad579dec693534105199f33d Mon Sep 17 00:00:00 2001 | 1 | From 37ea0b0c40f541cf9741c064e97ec9e9327ba7a1 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 |
@@ -24,7 +24,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
24 | 2 files changed, 2 insertions(+), 12 deletions(-) | 24 | 2 files changed, 2 insertions(+), 12 deletions(-) |
25 | 25 | ||
26 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | 26 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h |
27 | index 10458e41d7..8cfa40e461 100644 | 27 | index e6ad80525a..283ce1ce26 100644 |
28 | --- a/src/corelib/global/qconfig-bootstrapped.h | 28 | --- a/src/corelib/global/qconfig-bootstrapped.h |
29 | +++ b/src/corelib/global/qconfig-bootstrapped.h | 29 | +++ b/src/corelib/global/qconfig-bootstrapped.h |
30 | @@ -104,7 +104,7 @@ | 30 | @@ -104,7 +104,7 @@ |
@@ -46,7 +46,7 @@ index 10458e41d7..8cfa40e461 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 c3abec8..6229c61 100644 | 49 | index c3abec8989..6229c611b8 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 | @@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy | 52 | @@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy |
diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch index a12ba359..70f25ca2 100644 --- a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9d40b6e665f67f5096eba41bea13492d3eda056c Mon Sep 17 00:00:00 2001 | 1 | From 7596905dbe3ff36a129b5793966da30579d877f4 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 |
@@ -13,10 +13,10 @@ Upstream-Status: Inappropriate [OE specific] | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h | 15 | diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h |
16 | index 8cfa40e461..f2fba9ebd8 100644 | 16 | index 283ce1ce26..dfcbb15a6b 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 | @@ -95,7 +95,7 @@ |
20 | #define QT_FEATURE_itemmodel -1 | 20 | #define QT_FEATURE_itemmodel -1 |
21 | #define QT_FEATURE_library -1 | 21 | #define QT_FEATURE_library -1 |
22 | #ifdef __linux__ | 22 | #ifdef __linux__ |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5f6e2e65..16e25d7f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = " \ | |||
13 | " | 13 | " |
14 | 14 | ||
15 | # common for qtbase-native, qtbase-nativesdk and qtbase | 15 | # common for qtbase-native, qtbase-nativesdk and qtbase |
16 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.13-shared | 16 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.14-shared |
17 | # 5.13.meta-qt5-shared.1 | 17 | # 5.14.meta-qt5-shared.1 |
18 | SRC_URI += "\ | 18 | SRC_URI += "\ |
19 | file://0001-Add-linux-oe-g-platform.patch \ | 19 | file://0001-Add-linux-oe-g-platform.patch \ |
20 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 20 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |