diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 14:15:12 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-26 16:53:07 +0000 |
commit | 1d9fbb1576846318e6f842006bf8c27758f094fb (patch) | |
tree | 772f2b404ce6bb3c7c06bd381ccc72aa3efa741e /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
parent | a5aadb7a92558ea33833a189cc6b6fd1019c2a5b (diff) |
qt5: refresh patches from meta-qt5/qt* repos
* apply:
0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
also for nativesdk-qtbase as the comment says
* drop unused:
0001-Add-missing-include-for-struct-timeval.patch
which wasn't removed in 5.10.1 upgrade
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 fb2f76ed..efcb82c3 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-shared -# 5.10.meta-qt5-shared.1 +# 5.10.meta-qt5-shared.2 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -39,13 +39,14 @@ SRC_URI += "\ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ 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 \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.10.meta-qt5-native.1 +# 5.10.meta-qt5-native.2 SRC_URI += " \ - file://0012-Always-build-uic-and-qvkgen.patch \ + file://0013-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase |