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, 3 insertions, 3 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:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared
-# 5.12.meta-qt5-shared.3
+# 5.12.meta-qt5-shared.4
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -43,12 +43,12 @@ SRC_URI += "\
     file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
     file://0018-Fix-compile-issue-with-gcc-9.patch \
-    file://0019-qendian-Adding-Q_DECL_CONSTEXPR-to-float-conversion-.patch \
+    file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native
-# 5.12.meta-qt5-native.3
+# 5.12.meta-qt5-native.4
 SRC_URI += " \
     file://0020-Always-build-uic-and-qvkgen.patch \
 "