diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-20 09:52:18 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-21 07:26:36 +0000 |
| commit | 826c0b1092ede76f17de3b232ba7cc17a5be5830 (patch) | |
| tree | ff53da5c83196fc417c7e58f573d2a86343004e9 /recipes-qt/qt5/qtwebsockets_git.bb | |
| parent | 044ba1621532deed80ef79a15f5b225d8b9471ec (diff) | |
qt5: update submodules
Using WebKit from commit before Tokarev's wip merge
Change-Id: Ifd7606027698ad9500cd40529dfc179faa9e8e05
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebsockets_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebsockets_git.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index f39fb46f..fa775946 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -1,14 +1,14 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.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=bb426f3367c4805d1e12fad05bd0b750 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ " DEPENDS += "qtbase qtdeclarative" -SRCREV = "e5133f4f0bb7c01d7bd7fc499d8c148c03a5b500" +SRCREV = "26e56e18eb234df4a782737cd3c8d8d11daead2c" |