From be92484450f23ba8ab71bded5a56565b85bbfcf1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 8 Nov 2024 06:05:30 +0000 Subject: [PATCH] qt6: update licenses Continue license changes from 92833a85e73a6f6a2377b3e3fcdf0eb7ee810520, more modules are affected. Pick-to: 6.8 Change-Id: Ide2ea6f5c9d040c193a146964029241ce3531379 Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qthttpserver_git.bb | 3 +-- recipes-qt/qt6/qtlocation_git.bb | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/recipes-qt/qt6/qthttpserver_git.bb b/recipes-qt/qt6/qthttpserver_git.bb index 385a58b..d80da07 100644 --- a/recipes-qt/qt6/qthttpserver_git.bb +++ b/recipes-qt/qt6/qthttpserver_git.bb @@ -1,10 +1,9 @@ -LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause" +LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake diff --git a/recipes-qt/qt6/qtlocation_git.bb b/recipes-qt/qt6/qtlocation_git.bb index ce484e9..2d49d67 100644 --- a/recipes-qt/qt6/qtlocation_git.bb +++ b/recipes-qt/qt6/qtlocation_git.bb @@ -1,15 +1,12 @@ -LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & MIT" +LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & MIT" LIC_FILES_CHKSUM = " \ - file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \ file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \ - file://LICENSES/BSL-1.0.txt;md5=8c92b4c255bdcce2989707d5b8a4d302 \ file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \ - file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ " inherit qt6-cmake