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/0020-Always-build-uic-and-qvkgen.patch | |
| parent | c67abd66ff15feeaae5acc2688b932e5dec72317 (diff) | |
| download | meta-qt5-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/0020-Always-build-uic-and-qvkgen.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch index 89ea8778..2d942289 100644 --- a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From f43c877cc27a1042c5ba898fd3865164a200ce40 Mon Sep 17 00:00:00 2001 | 1 | From f8ae183b543b1244fb272f26db330f52e0d53161 Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
| 4 | Subject: [PATCH] Always build uic and qvkgen | 4 | Subject: [PATCH] Always build uic and qvkgen |