diff options
Diffstat (limited to 'recipes-qt')
7 files changed, 69 insertions, 59 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6c9853ea..dc1fc41b 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -23,7 +23,7 @@ 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.12-shared | 25 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared |
26 | # 5.12.meta-qt5-shared.3 | 26 | # 5.12.meta-qt5-shared.4 |
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 \ |
@@ -43,12 +43,12 @@ SRC_URI += "\ | |||
43 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 43 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
44 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 44 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
45 | file://0018-Fix-compile-issue-with-gcc-9.patch \ | 45 | file://0018-Fix-compile-issue-with-gcc-9.patch \ |
46 | file://0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch \ | 46 | file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ |
47 | " | 47 | " |
48 | 48 | ||
49 | # common for qtbase-native and nativesdk-qtbase | 49 | # common for qtbase-native and nativesdk-qtbase |
50 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native | 50 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native |
51 | # 5.12.meta-qt5-native.3 | 51 | # 5.12.meta-qt5-native.4 |
52 | SRC_URI += " \ | 52 | SRC_URI += " \ |
53 | file://0020-Always-build-uic-and-qvkgen.patch \ | 53 | file://0020-Always-build-uic-and-qvkgen.patch \ |
54 | " | 54 | " |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index d224487c..9f0fca51 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -18,7 +18,7 @@ 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.12-shared | 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared |
21 | # 5.12.meta-qt5-shared.3 | 21 | # 5.12.meta-qt5-shared.4 |
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 \ |
@@ -38,12 +38,12 @@ SRC_URI += "\ | |||
38 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 38 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
39 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 39 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
40 | file://0018-Fix-compile-issue-with-gcc-9.patch \ | 40 | file://0018-Fix-compile-issue-with-gcc-9.patch \ |
41 | file://0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch \ | 41 | file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ |
42 | " | 42 | " |
43 | 43 | ||
44 | # common for qtbase-native and nativesdk-qtbase | 44 | # common for qtbase-native and nativesdk-qtbase |
45 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native | 45 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native |
46 | # 5.12.meta-qt5-native.3 | 46 | # 5.12.meta-qt5-native.4 |
47 | SRC_URI += " \ | 47 | SRC_URI += " \ |
48 | file://0020-Always-build-uic-and-qvkgen.patch \ | 48 | file://0020-Always-build-uic-and-qvkgen.patch \ |
49 | " | 49 | " |
diff --git a/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch b/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch new file mode 100644 index 00000000..21e3207d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 4bcd7b1c6e06cfaef1a52795df007f1a9372eeed Mon Sep 17 00:00:00 2001 | ||
2 | From: Ville Voutilainen <ville.voutilainen@qt.io> | ||
3 | Date: Wed, 21 Nov 2018 14:07:18 +0200 | ||
4 | Subject: [PATCH] Fix compilation of qendian's qswap specializations on gcc 4.8 | ||
5 | |||
6 | Task-number: QTBUG-71945 | ||
7 | Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b | ||
8 | Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> | ||
9 | Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> | ||
10 | --- | ||
11 | src/corelib/global/qendian.h | 12 ++++++------ | ||
12 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h | ||
15 | index 0e67a1ab8e..f2e5833468 100644 | ||
16 | --- a/src/corelib/global/qendian.h | ||
17 | +++ b/src/corelib/global/qendian.h | ||
18 | @@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source) | ||
19 | return qFromUnaligned<Float>(&temp); | ||
20 | } | ||
21 | |||
22 | -template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source) | ||
23 | +inline qfloat16 qbswap(qfloat16 source) | ||
24 | { | ||
25 | return qbswapFloatHelper(source); | ||
26 | } | ||
27 | |||
28 | -template <> inline float qbswap<float>(float source) | ||
29 | +inline float qbswap(float source) | ||
30 | { | ||
31 | return qbswapFloatHelper(source); | ||
32 | } | ||
33 | |||
34 | -template <> inline double qbswap<double>(double source) | ||
35 | +inline double qbswap(double source) | ||
36 | { | ||
37 | return qbswapFloatHelper(source); | ||
38 | } | ||
39 | @@ -185,7 +185,7 @@ template <> inline double qbswap<double>(double source) | ||
40 | */ | ||
41 | template <typename T> inline void qbswap(const T src, void *dest) | ||
42 | { | ||
43 | - qToUnaligned<T>(qbswap<T>(src), dest); | ||
44 | + qToUnaligned<T>(qbswap(src), dest); | ||
45 | } | ||
46 | |||
47 | template <int Size> void *qbswap(const void *source, qsizetype count, void *dest) noexcept; | ||
48 | @@ -223,9 +223,9 @@ template <typename T> inline void qFromLittleEndian(const void *source, qsizetyp | ||
49 | #else // Q_LITTLE_ENDIAN | ||
50 | |||
51 | template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) | ||
52 | -{ return qbswap<T>(source); } | ||
53 | +{ return qbswap(source); } | ||
54 | template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) | ||
55 | -{ return qbswap<T>(source); } | ||
56 | +{ return qbswap(source); } | ||
57 | template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) | ||
58 | { return source; } | ||
59 | template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) | ||
diff --git a/recipes-qt/qt5/qtbase/0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch b/recipes-qt/qt5/qtbase/0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch deleted file mode 100644 index 42c3d2fb..00000000 --- a/recipes-qt/qt5/qtbase/0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From c10b4df78f56f4ad3db563fe73d0ebece3e5284c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 24 Dec 2018 00:05:06 -0800 | ||
4 | Subject: [PATCH] qendian: Adding Q_DECL_CONSTEXPR to float conversion | ||
5 | specializations | ||
6 | |||
7 | This fixes build failures seen with gcc 4.8 | ||
8 | Fixes https://bugreports.qt.io/browse/QTBUG-71945 | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/corelib/global/qendian.h | 8 ++++---- | ||
14 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h | ||
17 | index 0e67a1ab8e..75f109f26c 100644 | ||
18 | --- a/src/corelib/global/qendian.h | ||
19 | +++ b/src/corelib/global/qendian.h | ||
20 | @@ -153,7 +153,7 @@ template <> inline Q_DECL_CONSTEXPR qint8 qbswap<qint8>(qint8 source) | ||
21 | } | ||
22 | |||
23 | // floating specializations | ||
24 | -template<typename Float> | ||
25 | +template<typename Float> Q_DECL_CONSTEXPR | ||
26 | Float qbswapFloatHelper(Float source) | ||
27 | { | ||
28 | // memcpy call in qFromUnaligned is recognized by optimizer as a correct way of type prunning | ||
29 | @@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source) | ||
30 | return qFromUnaligned<Float>(&temp); | ||
31 | } | ||
32 | |||
33 | -template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source) | ||
34 | +template <> inline Q_DECL_CONSTEXPR qfloat16 qbswap<qfloat16>(qfloat16 source) | ||
35 | { | ||
36 | return qbswapFloatHelper(source); | ||
37 | } | ||
38 | |||
39 | -template <> inline float qbswap<float>(float source) | ||
40 | +template <> inline Q_DECL_CONSTEXPR float qbswap<float>(float source) | ||
41 | { | ||
42 | return qbswapFloatHelper(source); | ||
43 | } | ||
44 | |||
45 | -template <> inline double qbswap<double>(double source) | ||
46 | +template <> inline Q_DECL_CONSTEXPR double qbswap<double>(double source) | ||
47 | { | ||
48 | return qbswapFloatHelper(source); | ||
49 | } | ||
diff --git a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch index 89ea8778..2d942289 100644 --- a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f43c877cc27a1042c5ba898fd3865164a200ce40 Mon Sep 17 00:00:00 2001 | 1 | From f8ae183b543b1244fb272f26db330f52e0d53161 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 |
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 6ac54fdf..733e69ac 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 f21492a98b2a738e53134be8b7bf8ce44af71712 Mon Sep 17 00:00:00 2001 | 1 | From 4d5e38f1b5f42d61428b7984f9f4d7f22ebe2a2e 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 |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3f7ee3c7..5c967d2f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ | |||
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.12-shared | 16 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared |
17 | # 5.12.meta-qt5-shared.3 | 17 | # 5.12.meta-qt5-shared.4 |
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 \ |
@@ -34,7 +34,7 @@ SRC_URI += "\ | |||
34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ | 34 | file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ |
35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ | 35 | file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ |
36 | file://0018-Fix-compile-issue-with-gcc-9.patch \ | 36 | file://0018-Fix-compile-issue-with-gcc-9.patch \ |
37 | file://0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch \ | 37 | file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ |
38 | " | 38 | " |
39 | 39 | ||
40 | 40 | ||