diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-24 08:43:50 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-24 08:43:51 +0000 |
commit | 51e07805e0cf8f53bc9609854d1afd5e51494151 (patch) | |
tree | b76b4ff591d489b33886044dd67a94852c74ea3b /recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch | |
parent | c67abd66ff15feeaae5acc2688b932e5dec72317 (diff) | |
download | meta-qt5-upstream/jansa/master-5.12.tar.gz |
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>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch | 59 |
1 files changed, 59 insertions, 0 deletions
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) | ||