diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-19 10:11:38 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-26 11:04:58 +0000 |
| commit | c32de2f746d944f515e9e47dd330dfb64b3ca280 (patch) | |
| tree | e02d704af785be1c81916864b95b2836ea89e190 /recipes-qt/qt5/qtserialport_git.bb | |
| parent | bc0625e7a03f9f04fdae3a89137812a216e977cd (diff) | |
qt5: update submodules
- Update Qt submodules to 5.10.1 snapshot
- Some cleanup for licenses
Task-number: QTBUG-65164
Change-Id: I4a3fcbd441a222250c774e194632fa57285c13aa
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtserialport_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtserialport_git.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 11f8fd02..d988feec 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -3,16 +3,16 @@ require qt5-git.inc # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what # other qt* components use :/ -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ " DEPENDS += "qtbase" -SRCREV = "00f3e2df573400c7ee350bc2b2c5e89e50ab27ca" +SRCREV = "7c827dcbf82d5e5bfbba4053a32c54413a95182a" |