qtbase: replace the fix for gcc-4.8 with the one from upstreamupstream/jansa/master-5.12jansa/master-5.12

* fixes:
| In file included from ../include/QtCore/qendian.h:1:0,
|                  from /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+13ed06640c-r0/git/src/corelib/codecs/qutfcodec.cpp:43:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:167:36:   required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = qfloat16]� not a return-statement
|  }
|  ^
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = float]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:172:29:   required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = float]� not a return-statement
| ../include/QtCore/../../../git/src/corelib/global/qendian.h: In instantiation of �constexpr Float qbswapFloatHelper(Float) [with Float = double]�:
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:177:29:   required from here
| ../include/QtCore/../../../git/src/corelib/global/qendian.h:163:1: error: body of constexpr function �constexpr Float qbswapFloatHelper(Float) [with Float = double]� not a return-statement

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 0 insertions, 49 deletions

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 @@
-From c10b4df78f56f4ad3db563fe73d0ebece3e5284c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 24 Dec 2018 00:05:06 -0800
-Subject: [PATCH] qendian: Adding Q_DECL_CONSTEXPR to float conversion
- specializations
-
-This fixes build failures seen with gcc 4.8
-Fixes https://bugreports.qt.io/browse/QTBUG-71945
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/corelib/global/qendian.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h
-index 0e67a1ab8e..75f109f26c 100644
---- a/src/corelib/global/qendian.h
-+++ b/src/corelib/global/qendian.h
-@@ -153,7 +153,7 @@ template <> inline Q_DECL_CONSTEXPR qint8 qbswap<qint8>(qint8 source)
- }
- 
- // floating specializations
--template<typename Float>
-+template<typename Float> Q_DECL_CONSTEXPR
- Float qbswapFloatHelper(Float source)
- {
-     // memcpy call in qFromUnaligned is recognized by optimizer as a correct way of type prunning
-@@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source)
-     return qFromUnaligned<Float>(&temp);
- }
- 
--template <> inline qfloat16 qbswap<qfloat16>(qfloat16 source)
-+template <> inline Q_DECL_CONSTEXPR qfloat16 qbswap<qfloat16>(qfloat16 source)
- {
-     return qbswapFloatHelper(source);
- }
- 
--template <> inline float qbswap<float>(float source)
-+template <> inline Q_DECL_CONSTEXPR float qbswap<float>(float source)
- {
-     return qbswapFloatHelper(source);
- }
- 
--template <> inline double qbswap<double>(double source)
-+template <> inline Q_DECL_CONSTEXPR double qbswap<double>(double source)
- {
-     return qbswapFloatHelper(source);
- }