diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-15 08:47:57 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-22 13:56:45 +0000 |
| commit | e41caf42e9e8a69d2f8f7a70365fbb441f0a01e8 (patch) | |
| tree | a27760bfe20bc9b4a33ea478b39dc84338a89e2f /recipes-qt/qt5/qtsystems_git.bb | |
| parent | 5250890a9f7b42a77711dfe9a3adcf86b576c2a8 (diff) | |
Upgrade to Qt 5.10.1
Updated Qt modules to 5.10.1.
New recipe qtknx added.
Change-Id: I711c75253a9c0d9dcfbaac8867b35a4505d101ea
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtsystems_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtsystems_git.bb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index bc3e289f..0bda2e99 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -1,12 +1,13 @@ require qt5.inc require qt5-git.inc -LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0" +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=4193e7f1d47a858f6b7c0f1ee66161de \ - file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " DEPENDS += "qtbase qtdeclarative udev gconf" @@ -30,4 +31,4 @@ do_install_append() { QT_MODULE_BRANCH = "dev" -SRCREV = "ca54870ffdf262f072c082adf80d63c421dbd68f" +SRCREV = "66e45676f5f5c6251ccab36906c6324fd0065e08" |