diff options
| author | Alistair Francis <alistair.francis@wdc.com> | 2018-06-22 12:41:25 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-25 14:30:57 +0000 |
| commit | 40054db1de152d85c22aefdae50b136ca56967c5 (patch) | |
| tree | f68ced3fd5ace5a6cc7723da4abf336e6cf3c89f /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| parent | dd1ce3c95ce3613df51bb9585fe1b73e8c96480a (diff) | |
qt5: qtbase: Upgrade Double-Conversion
Backport the Double-Conversion upgrade from the dev branch
(https://codereview.qt-project.org/#/c/227718/) to the current release.
This fixes the RISC-V compile of QTBase.
Signed-off-by: Alistair Francis <alistair.francis@wdc.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 dc01cef9..595e5858 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -24,7 +24,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.5 +# 5.11.meta-qt5-shared.6 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,13 +38,14 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.5 +# 5.11.meta-qt5-native.6 SRC_URI += " \ - file://0013-Always-build-uic-and-qvkgen.patch \ + file://0014-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase |