diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-04 12:38:41 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-05 07:01:47 +0000 |
| commit | 0ab7116f9cbb93b3132481731db296245044fbff (patch) | |
| tree | 3a57782f805750428233c812f37e897fa7a1a994 /recipes-qt/qt5/qtbase-native_git.bb | |
| parent | 54ff6c13316cc975852c9712d7086de5ff32da6a (diff) | |
| download | meta-qt5-0ab7116f9cbb93b3132481731db296245044fbff.tar.gz | |
qt5: update to Qt 5.11.2
The commercial Qt license agreement was added in qtbase, use that
as the The-Qt-Company-Commercial license. Remove old licenses that
are no longer used.
Change-Id: I25172c46b36c3b342ef0cf89ba9741c7c9fc7b7e
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase-native_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 819f4473..97addb4f 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
| @@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 9 | file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
| 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ | 10 | file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ |
| 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ | 11 | file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ |
| 12 | file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ | ||
| 13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 12 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
| 14 | file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ | 13 | file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ |
| 15 | " | 14 | " |
| 16 | 15 | ||
| 17 | require qt5-native.inc | 16 | require qt5-native.inc |
| @@ -135,4 +134,4 @@ do_install() { | |||
| 135 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 134 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
| 136 | } | 135 | } |
| 137 | 136 | ||
| 138 | SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" | 137 | SRCREV = "85913b4afcee5ff0b0fa7d375ae735615b03b53d" |
