diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase')
4 files changed, 0 insertions, 163 deletions
diff --git a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch deleted file mode 100644 index e5e9813b..00000000 --- a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 4bc9f80bb0875648a2f3eca5b14e4e9e56cfda4d Mon Sep 17 00:00:00 2001 | ||
2 | From: Allan Sandfeld Jensen <allan.jensen@qt.io> | ||
3 | Date: Tue, 13 Nov 2018 16:00:23 +0100 | ||
4 | Subject: [PATCH] Fix compile issue with gcc 9 | ||
5 | |||
6 | It appears messenne_twisters in the latest libstdc++ has one more | ||
7 | requirement before it is willing to construct with our | ||
8 | SystemGenerator struct as an sseq provider. | ||
9 | |||
10 | Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe | ||
11 | Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | ||
12 | Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | ||
13 | --- | ||
14 | src/corelib/global/qrandom.cpp | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp | ||
18 | index 23e5e499b2..03534cf453 100644 | ||
19 | --- a/src/corelib/global/qrandom.cpp | ||
20 | +++ b/src/corelib/global/qrandom.cpp | ||
21 | @@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator | ||
22 | #endif // Q_OS_WINRT | ||
23 | |||
24 | static SystemGenerator &self(); | ||
25 | + typedef quint32 result_type; | ||
26 | void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); | ||
27 | |||
28 | // For std::mersenne_twister_engine implementations that use something | ||
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 deleted file mode 100644 index 21e3207d..00000000 --- a/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
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/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch b/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch deleted file mode 100644 index 4169fb76..00000000 --- a/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ville Voutilainen <ville.voutilainen@qt.io> | ||
3 | Date: Fri, 4 Jan 2019 09:35:40 +0200 | ||
4 | Subject: [PATCH] Fix qbswap calls for Big Endian targets | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Task-number: QTBUG-71945 | ||
8 | Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac | ||
9 | --- | ||
10 | src/corelib/global/qendian.h | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h | ||
14 | index f2e5833468..615f523888 100644 | ||
15 | --- a/src/corelib/global/qendian.h | ||
16 | +++ b/src/corelib/global/qendian.h | ||
17 | @@ -204,9 +204,9 @@ template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source) | ||
18 | template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) | ||
19 | { return source; } | ||
20 | template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) | ||
21 | -{ return qbswap<T>(source); } | ||
22 | +{ return qbswap(source); } | ||
23 | template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) | ||
24 | -{ return qbswap<T>(source); } | ||
25 | +{ return qbswap(source); } | ||
26 | template <typename T> inline void qToBigEndian(T src, void *dest) | ||
27 | { qToUnaligned<T>(src, dest); } | ||
28 | template <typename T> inline void qToLittleEndian(T src, void *dest) | ||
diff --git a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch b/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch deleted file mode 100644 index 0576a22c..00000000 --- a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From f958dccc8c7c777aaca1f110ed48c71b28fdea92 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 1 Mar 2019 15:11:19 -0800 | ||
4 | Subject: [PATCH] Fix build failure with clang | ||
5 | |||
6 | Complement below commit | ||
7 | |||
8 | commit 1555894dec537cbc422f43fe959b0d0ee0000881 | ||
9 | Author: Thiago Macieira <thiago.macieira@intel.com> | ||
10 | Date: Wed Jul 25 19:04:20 2018 -0700 | ||
11 | |||
12 | QCborValue: Disable support for spaceship operator | ||
13 | |||
14 | __has_include(<compare>) is not the correct way to detect this feature, | ||
15 | since that's a library header and may be provided by an implementation | ||
16 | (libc++) before the compiler supports the syntax. | ||
17 | |||
18 | Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b | ||
19 | Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> | ||
20 | |||
21 | Fixes | ||
22 | tst_qcborvalue.cpp:336:17: error: invalid operands to binary expression ('QCborValue' and 'QCborValue') | ||
23 | QVERIFY(!(v > other)); | ||
24 | ~ ^ ~~~~~ | ||
25 | |||
26 | Upstream-Status: Pending | ||
27 | |||
28 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
29 | --- | ||
30 | tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 +- | ||
31 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
32 | |||
33 | diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | ||
34 | index 38b26e7de4..4b753eab6b 100644 | ||
35 | --- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | ||
36 | +++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | ||
37 | @@ -330,7 +330,7 @@ void tst_QCborValue::copyCompare() | ||
38 | QCOMPARE(v, other); | ||
39 | QVERIFY(!(v != other)); | ||
40 | QVERIFY(!(v < other)); | ||
41 | -#if QT_HAS_INCLUDE(<compare>) | ||
42 | +#if 0 && QT_HAS_INCLUDE(<compare>) | ||
43 | QVERIFY(v <= other); | ||
44 | QVERIFY(v >= other); | ||
45 | QVERIFY(!(v > other)); | ||
46 | -- | ||
47 | 2.21.0 | ||
48 | |||