aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2021-12-28 09:43:08 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-14 11:00:55 +0000
commitb25e739420c29021a4d88201c0e5a758fcca24e4 (patch)
treed2dbd899f5cddac044e68000664fb5db0c14efa8
parentb406bcc5a0acc5d9c6e9b5444e0485c8327583c5 (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. Change-Id: I1481dacf7e8da594866ebba13a5fa44f167562d8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit b7437b7c2f076fc8302940964288bcd26f358515) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat
-rw-r--r--recipes-qt/qt6/qt3d_git.bb2
-rw-r--r--recipes-qt/qt6/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt6/qtcoap_git.bb2
-rw-r--r--recipes-qt/qt6/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt6/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt6/qtopcua_git.bb2
-rw-r--r--recipes-qt/qt6/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt6/qtquicktimeline_git.bb2
-rw-r--r--recipes-qt/qt6/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt6/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt6/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt6/qtshadertools_git.bb2
-rw-r--r--recipes-qt/qt6/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt6/qtwebsockets_git.bb2
14 files changed, 14 insertions, 14 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 942bd10..e9205f6 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 fdeefa2..ae6809a 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/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb
index 1ff5a83..f4b9eee 100644
--- a/recipes-qt/qt6/qtserialbus_git.bb
+++ b/recipes-qt/qt6/qtserialbus_git.bb
@@ -1,4 +1,4 @@
-LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.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/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb
index 2fd2fc9..256aff8 100644
--- a/recipes-qt/qt6/qtshadertools_git.bb
+++ b/recipes-qt/qt6/qtshadertools_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 ) & ( 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 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 11:47:52 +0000