Upgrade to 5.12.2

Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>

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 @@
-From 4bc9f80bb0875648a2f3eca5b14e4e9e56cfda4d Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Tue, 13 Nov 2018 16:00:23 +0100
-Subject: [PATCH] Fix compile issue with gcc 9
-
-It appears messenne_twisters in the latest libstdc++ has one more
-requirement before it is willing to construct with our
-SystemGenerator struct as an sseq provider.
-
-Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe
-Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/corelib/global/qrandom.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 23e5e499b2..03534cf453 100644
---- a/src/corelib/global/qrandom.cpp
-+++ b/src/corelib/global/qrandom.cpp
-@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator
- #endif // Q_OS_WINRT
- 
-     static SystemGenerator &self();
-+    typedef quint32 result_type;
-     void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept);
- 
-     // 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 @@
-From 4bcd7b1c6e06cfaef1a52795df007f1a9372eeed Mon Sep 17 00:00:00 2001
-From: Ville Voutilainen <ville.voutilainen@qt.io>
-Date: Wed, 21 Nov 2018 14:07:18 +0200
-Subject: [PATCH] Fix compilation of qendian's qswap specializations on gcc 4.8
-
-Task-number: QTBUG-71945
-Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b
-Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
----
- src/corelib/global/qendian.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
-index 0e67a1ab8e..f2e5833468 100644
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source)
-     return qFromUnaligned<Float>(&temp);
- }
- 
--template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source)
-+inline qfloat16 qbswap(qfloat16 source)
- {
-     return qbswapFloatHelper(source);
- }
- 
--template <> inline float qbswap<float>(float source)
-+inline float qbswap(float source)
- {
-     return qbswapFloatHelper(source);
- }
- 
--template <> inline double qbswap<double>(double source)
-+inline double qbswap(double source)
- {
-     return qbswapFloatHelper(source);
- }
-@@ -185,7 +185,7 @@ template <> inline double qbswap<double>(double source)
- */
- template <typename T> inline void qbswap(const T src, void *dest)
- {
--    qToUnaligned<T>(qbswap<T>(src), dest);
-+    qToUnaligned<T>(qbswap(src), dest);
- }
- 
- template <int Size> void *qbswap(const void *source, qsizetype count, void *dest) noexcept;
-@@ -223,9 +223,9 @@ template <typename T> inline void qFromLittleEndian(const void *source, qsizetyp
- #else // Q_LITTLE_ENDIAN
- 
- template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source)
--{ return qbswap<T>(source); }
-+{ return qbswap(source); }
- template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source)
--{ return qbswap<T>(source); }
-+{ return qbswap(source); }
- template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source)
- { return source; }
- 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 @@
-From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001
-From: Ville Voutilainen <ville.voutilainen@qt.io>
-Date: Fri, 4 Jan 2019 09:35:40 +0200
-Subject: [PATCH] Fix qbswap calls for Big Endian targets
-
-Upstream-Status: Backport
-Task-number: QTBUG-71945
-Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac
----
- src/corelib/global/qendian.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
-index f2e5833468..615f523888 100644
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -204,9 +204,9 @@ template <typename T> inline Q_DECL_CONSTEXPR T qToBigEndian(T source)
- template <typename T> inline Q_DECL_CONSTEXPR T qFromBigEndian(T source)
- { return source; }
- template <typename T> inline Q_DECL_CONSTEXPR T qToLittleEndian(T source)
--{ return qbswap<T>(source); }
-+{ return qbswap(source); }
- template <typename T> inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source)
--{ return qbswap<T>(source); }
-+{ return qbswap(source); }
- template <typename T> inline void qToBigEndian(T src, void *dest)
- { qToUnaligned<T>(src, dest); }
- 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 @@
-From f958dccc8c7c777aaca1f110ed48c71b28fdea92 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 1 Mar 2019 15:11:19 -0800
-Subject: [PATCH] Fix build failure with clang
-
-Complement below commit
-
-commit 1555894dec537cbc422f43fe959b0d0ee0000881
-Author: Thiago Macieira <thiago.macieira@intel.com>
-Date:   Wed Jul 25 19:04:20 2018 -0700
-
-    QCborValue: Disable support for spaceship operator
-
-    __has_include(<compare>) is not the correct way to detect this feature,
-    since that's a library header and may be provided by an implementation
-    (libc++) before the compiler supports the syntax.
-
-    Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b
-    Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-
-Fixes
-tst_qcborvalue.cpp:336:17: error: invalid operands to binary expression ('QCborValue' and 'QCborValue')
-    QVERIFY(!(v > other));
-              ~ ^ ~~~~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
-index 38b26e7de4..4b753eab6b 100644
---- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
-+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
-@@ -330,7 +330,7 @@ void tst_QCborValue::copyCompare()
-     QCOMPARE(v, other);
-     QVERIFY(!(v != other));
-     QVERIFY(!(v < other));
--#if QT_HAS_INCLUDE(<compare>)
-+#if 0 && QT_HAS_INCLUDE(<compare>)
-     QVERIFY(v <= other);
-     QVERIFY(v >= other);
-     QVERIFY(!(v > other));
--- 
-2.21.0
-