summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucie Gérard <[email protected]>2024-10-01 09:56:20 +0200
committerQt Cherry-pick Bot <[email protected]>2024-11-04 07:53:21 +0000
commit43e6790648ff52ce68eff00f14eabadcd1f319ef (patch)
tree04045609e5fb425de70896c7eb82594a4e07513f
parenta746dc5f15c1bf3f4327c2f900df5ea236d7b5df (diff)
Add REUSE.toml files and missing licenses
REUSE.toml files are read by reuse to complement or override the copyright and licensing information found in file. The use of REUSE.toml files was introduced in REUSE version 3.1.0a1. This reuse version is compatible with reuse specification version 3.2 [1]. With this commit's files, * The SPDX document generated by reuse spdx conforms to SPDX 2.3, * The reuse lint command reports that the Qt project is reuse compliant. In order to be reuse compliant all the licenses referenced in file or within a REUSE.toml file must be present in the LICENSES directory at the base of the module. The missing licenses are added. Also, all the licenses present in the LICENSES directory must be used. License files not used are removed. [1]: https://reuse.software/spec-3.2/ Task-number: QTBUG-124453 Task-number: QTBUG-125211 Change-Id: Ia44822439d3047f71c92817949965a2b2e6bdf43 Reviewed-by: Christian Strømme <[email protected]> (cherry picked from commit 15157aca4365710ae4d1951e60b3f1e7fa03e227) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
-rw-r--r--LICENSES/Qt-GPL-exception-1.0.txt22
-rw-r--r--REUSE.toml52
-rw-r--r--dist/REUSE.toml8
3 files changed, 60 insertions, 22 deletions
diff --git a/LICENSES/Qt-GPL-exception-1.0.txt b/LICENSES/Qt-GPL-exception-1.0.txt
deleted file mode 100644
index d0322bf..0000000
--- a/LICENSES/Qt-GPL-exception-1.0.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-The Qt Company GPL Exception 1.0
-
-Exception 1:
-
-As a special exception you may create a larger work which contains the
-output of this application and distribute that work under terms of your
-choice, so long as the work is not otherwise derived from or based on
-this application and so long as the work does not in itself generate
-output that contains the output from this application in its original
-or modified form.
-
-Exception 2:
-
-As a special exception, you have permission to combine this application
-with Plugins licensed under the terms of your choice, to produce an
-executable, and to copy and distribute the resulting executable under
-the terms of your choice. However, the executable must be accompanied
-by a prominent notice offering all users of the executable the entire
-source code to this application, excluding the source code of the
-independent modules, but including any changes you have made to this
-application, under the terms of this license.
-
diff --git a/REUSE.toml b/REUSE.toml
new file mode 100644
index 0000000..5c793a0
--- /dev/null
+++ b/REUSE.toml
@@ -0,0 +1,52 @@
+version = 1
+
+[[annotations]]
+path = ["tests/auto/qml/qquickwebview/dummy.qml",
+ "tests/auto/qml/qquickwebview/html/*.html",
+ "tests/auto/qml/qquickwebview/html/resources/simple_image.png"]
+precedence = "closest"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only"
+
+[[annotations]]
+path = ["**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml", "**.json",
+ "**BLACKLIST", "**.plist"]
+precedence = "closest"
+comment = "build system"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = [".tag", "**/.gitattributes", "**.gitignore"]
+precedence = "closest"
+comment = "version control system. Licensed as build system"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = ["**/doc/images/**", "examples/webview/minibrowser/images/*"]
+comment = "this must be after the build system table because example and snippets take precedence over build system"
+precedence = "closest"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
+
+[[annotations]]
+path = ["**.qdocconf"]
+comment = "documentation"
+precedence = "closest"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
+
+[[annotations]]
+path = ["**.toml", "licenseRule.json"]
+comment = "documentation"
+precedence = "override"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
+
+[[annotations]]
+path = ["**/qt_attribution.json"]
+comment = "documentation"
+precedence = "override"
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
diff --git a/dist/REUSE.toml b/dist/REUSE.toml
new file mode 100644
index 0000000..f14104b
--- /dev/null
+++ b/dist/REUSE.toml
@@ -0,0 +1,8 @@
+version = 1
+
+[[annotations]]
+path = ["*"]
+precedence = "override"
+comment = "Licensed as documentation."
+SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
+SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"