summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-07-04 12:38:41 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-07-05 07:01:47 +0000
commit0ab7116f9cbb93b3132481731db296245044fbff (patch)
tree3a57782f805750428233c812f37e897fa7a1a994 /recipes-qt/qt5/qtbase_git.bb
parent54ff6c13316cc975852c9712d7086de5ff32da6a (diff)
downloadmeta-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_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase_git.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 001838bc..c68a963e 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = " \
8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
11 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.PREVIEW.COMMERCIAL;md5=8ee24b8d305ef7779e07647a7b70e1bc \ 12 file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \
14" 13"
15 14
16# common for qtbase-native, qtbase-nativesdk and qtbase 15# common for qtbase-native, qtbase-nativesdk and qtbase
@@ -249,4 +248,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
249 248
250RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 249RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
251 250
252SRCREV = "74305ba470f48da8b4c4e806fc714fe9f7649156" 251SRCREV = "85913b4afcee5ff0b0fa7d375ae735615b03b53d"