diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-12-24 00:09:00 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-24 08:29:40 +0000 |
| commit | c67abd66ff15feeaae5acc2688b932e5dec72317 (patch) | |
| tree | 303dc4916ab9a3be3fce45092d2e2200bfa0659e /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | f69fc4063ccbc3774df6f73fa59f9558eede8128 (diff) | |
qtbase: Fix build with gcc 4.8
Fixes errors like
In file included from ../include/QtCore/qendian.h:1:0,
from TOPDIR/build/tmp/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:165:61: error: redeclaration ‘constexpr T qbswap(T) [with T = qfloat16]’ differs in ‘constexpr’
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 31687913..6c9853ea 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.2 +# 5.12.meta-qt5-shared.3 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -43,13 +43,14 @@ 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 \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.2 +# 5.12.meta-qt5-native.3 SRC_URI += " \ - file://0019-Always-build-uic-and-qvkgen.patch \ + file://0020-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase |