diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 16:42:32 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | 3e7da25564d74195610adede9391ca733a0a1412 (patch) | |
tree | 6cc77f6d18df75d2c86191aea62e7336f24a1dbc /recipes-qt/qt5/qtbase-native_git.bb | |
parent | cd0da4e4836cc1f35ad522b34ed254a83b270167 (diff) |
qt5: update to Qt 5.11.2
Update The-Qt-Company-Commercial license to the actual commercial
license which also replaces preview license in qtbase. Remove old
licenses that are no longer used in any module.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 03e7af2a..cf9d1bc3 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ + file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ " require qt5-native.inc @@ -34,7 +33,6 @@ SRC_URI += "\ 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 \ - file://0014-Fix-qmake-build-with-glibc-2.28.patch \ file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ " @@ -137,4 +135,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" +SRCREV = "b0dce506cc91c4b623eb323db7bbc18469e721c2" |