From 44538bd408cc7d82b858146b759024f5e38e64cc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 4 Jul 2018 10:20:19 +0300 Subject: Upgrade to Qt 5.12.0 Change-Id: I83beaa146a88bf6138e11c87a3308db38d9afd34 Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtcanvas3d_git.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'recipes-qt/qt5/qtcanvas3d_git.bb') diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 9be6d3d6..9f41a020 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -1,13 +1,14 @@ require qt5.inc require qt5-git.inc -LICENSE = "LGPL-3.0 | GPL-3.0 | The-Qt-Company-Commercial" +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.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - 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 = "qtdeclarative" -SRCREV = "43f3a363133a93e2c6e465d149476a18f3a5d4e5" +SRCREV = "d5565b5cee35570e185b34ca143158f79a27a3a5" -- cgit v1.2.3-54-g00ecf