From cb00ee0cff8cd1b0ee0c4b22ce688ffa15553396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Tue, 24 Sep 2024 13:52:32 +0200 Subject: [PATCH] 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 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 Pick-to: 6.8 Change-Id: If5891d7b09a559e55081ef4e9111d91eb49a6b14 Reviewed-by: Joerg Bornemann --- LICENSES/Qt-GPL-exception-1.0.txt | 22 ---------------- REUSE.toml | 43 +++++++++++++++++++++++++++++++ dist/REUSE.toml | 8 ++++++ 3 files changed, 51 insertions(+), 22 deletions(-) delete mode 100644 LICENSES/Qt-GPL-exception-1.0.txt create mode 100644 REUSE.toml create mode 100644 dist/REUSE.toml 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..8702037 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,43 @@ +version = 1 + +[[annotations]] +path = [".cmake.conf", "**.yaml", "**.json", "**.pro"] +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/**"] +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", "src/mqtt/doc/style/style.css", "tests/README.txt"] +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 = "currently not needed, but ready if such file is added. 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"