diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-12-28 09:43:08 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-01-20 22:07:11 +0200 |
commit | a3455423aeab6d09b39e3a525bd362c67b46abed (patch) | |
tree | f3074e62d207edcecc0986220e8a1717f447f425 | |
parent | 13ba5dc14d758e1c734aea8831135c7a742d209d (diff) |
qt6: Update license clauses
Previous submodule update brought in license file
updates for several modules, removing obsolete ones
and adding missing ones. Update license clauses for
the modules to match current licensing.
* Cherry-pick adaptations for 6.2 branch:
qtserialbus & qtshadertools updates omitted
as those are not applicable in 6.2 branch
Change-Id: I1481dacf7e8da594866ebba13a5fa44f167562d8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b7437b7c2f076fc8302940964288bcd26f358515)
(cherry picked from commit 21a91d465d5eb1d4a051dc0303df0e207d131181)
-rw-r--r-- | recipes-qt/qt6/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtcharts_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtcoap_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtlottie_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtmqtt_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtopcua_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquicktimeline_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtscxml_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtwebsockets_git.bb | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index 29f18d1..526d316 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -1,4 +1,4 @@ -LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & ( LGPL-3.0 | GPL-2.0 ) | The-Qt-Company-Commercial )" +LICENSE = "BSD-3-Clause & ( 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.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index 875807e..5bce6c0 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -1,4 +1,4 @@ -LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index 5e05bb1..b36b65e 100644 --- a/recipes-qt/qt6/qtcoap_git.bb +++ b/recipes-qt/qt6/qtcoap_git.bb @@ -1,4 +1,4 @@ -LICENSE = "GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb index 8aee05c..7b1e0df 100644 --- a/recipes-qt/qt6/qtlottie_git.bb +++ b/recipes-qt/qt6/qtlottie_git.bb @@ -1,4 +1,4 @@ -LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index 0f0c4c1..60d3be6 100644 --- a/recipes-qt/qt6/qtmqtt_git.bb +++ b/recipes-qt/qt6/qtmqtt_git.bb @@ -1,4 +1,4 @@ -LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 638dbb6..9c4e731 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -1,4 +1,4 @@ -LICENSE = "( GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.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 ) & MPL-2.0 & CC0-1.0" LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index d98ae06..14775ea 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -1,4 +1,4 @@ -LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial )" +LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index 56cc238..f0818b4 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -1,4 +1,4 @@ -LICENSE = "GPL-2.0+ | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb index 1de4d1e..56e0909 100644 --- a/recipes-qt/qt6/qtremoteobjects_git.bb +++ b/recipes-qt/qt6/qtremoteobjects_git.bb @@ -1,4 +1,4 @@ -LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-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.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb index a905fbd..98c67e9 100644 --- a/recipes-qt/qt6/qtscxml_git.bb +++ b/recipes-qt/qt6/qtscxml_git.bb @@ -1,4 +1,4 @@ -LICENSE = "LGPL-3.0 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.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.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index 52db98a..ec0ac8e 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -1,4 +1,4 @@ -LICENSE = "GPL-3.0 | The-Qt-Company-Commercial" +LICENSE = "GFDL-1.3 & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial" LIC_FILES_CHKSUM = " \ file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index 26fb334..a77ab4f 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -1,4 +1,4 @@ -LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-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.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |