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/qtx11extras_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/qtx11extras_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtx11extras_git.bb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index c53e0b21..082d3bf4 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -1,16 +1,15 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" +LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( 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://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " DEPENDS += "qtbase" -SRCREV = "a3570e9bab1abe5c80e00ddc10ae688c654c1427" +SRCREV = "131aa9037dd93595473bc7277123fbc3360ae15b" |