Update licensing of files with infrastructure type

A QUIP 18[1] update sets git files, REUSE.toml and licenseRule.json
as infrastructure type files. They are licensed with:
LicenseRef-Qt-Commercial OR BSD-3-Clause

[1]: https://contribute.qt-project.org/quips/18

Pick-to: 6.9 6.8
Change-Id: Ib3bbda05a9b150dc9f7da564cd3bdc2691a749cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Lucie Gérard 2025-03-10 20:48:21 +01:00
parent c0496671be
commit 2bc78bfb7d
3 changed files with 92 additions and 81 deletions

View File

@ -1,5 +1,5 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
# Evaluate features before including repository subparts.
---

View File

@ -21,18 +21,18 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-
[[annotations]]
path = ["**CMakeLists.txt", ".cmake.conf", "**.yaml", "**.json",
"**.cfg", "**BLACKLIST", "**.cmake.in"]
"**.cfg", "**BLACKLIST", "**.cmake.in", ".tag"]
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", "**/.gitreview"]
comment = "version control system. Licensed as build system"
path = ["**/.gitattributes", "**.gitignore", "**.gitreview"]
comment = "version control system. infrastructure"
precedence = "closest"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "BSD-3-Clause"
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
[[annotations]]
path = ["examples/**", "**/src/snippets/**"]
@ -58,7 +58,7 @@ SPDX-License-Identifier = "LicenseRef-protobuf"
path = ["**.toml", "licenseRule.json"]
precedence = "override"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
[[annotations]]
path = ["**/qt_attribution.json"]

View File

@ -1,6 +1,6 @@
[
{
"comment" : ["file_pattern_ending: strings matched against the end of a file name.",
"comment": ["file_pattern_ending: strings matched against the end of a file name.",
"location keys: regular expression matched against the beginning of",
"the file path (relative to the git submodule root).",
"spdx: list of SPDX-License-Expression's allowed in the matching files.",
@ -9,108 +9,119 @@
"unless they are examples",
"Files with other endings can also be build system files"
],
"file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
"configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in",".clang-format",
".cmake.conf", ".gitattributes", ".gitignore", ".tag", "ci_config_linux.json",
".yaml", "BLACKLIST", ".gitreview"],
"location" : {
"" : {
"comment" : "Default",
"file type" : "build system",
"spdx" : ["BSD-3-Clause"]
"file_pattern_ending": ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
"configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in",
".cmake.conf", ".tag", "ci_config_linux.json",
".yaml", "BLACKLIST"],
"location": {
"": {
"comment": "Default",
"file type": "build system",
"spdx": ["BSD-3-Clause"]
},
"(.*)(examples/|snippets/)" : {
"comment" : "Example takes precedent",
"file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
"(.*)(examples/|snippets/)": {
"comment": "Example takes precedent",
"file type": "examples and snippets",
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}
}
},
{
"comments" : ["Files with the following endings are Tool licensed,",
"comments": ["Files with the following endings are infrastructure licensed"],
"file_pattern_ending": [".gitattributes", ".gitignore", ".gitmodules", ".gitreview",
".clang-format", "licenseRule.json", "REUSE.toml"],
"location":{
"": {
"comment": "Default",
"file type": "infrastructure",
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}
}
},
{
"comments": ["Files with the following endings are Tool licensed,",
"unless they are examples.",
"Files with other endings can also be tool files."],
"file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"],
"location" :{
"" : {
"comment" : "Default",
"file type" : "tools and utils",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
"file_pattern_ending": [".sh", ".py", ".pl", ".bat", ".ps1"],
"location":{
"": {
"comment": "Default",
"file type": "tools and utils",
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
},
"(.*)(examples/|snippets/)" : {
"comment" : "Example takes precedent",
"file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
"(.*)(examples/|snippets/)": {
"comment": "Example takes precedent",
"file type": "examples and snippets",
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}
}
},
{
"comment" : "Files with the following endings are Documentation licensed.",
"file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
"REUSE.toml", "licenseRule.json"],
"location" :{
"" : {
"comment" : "",
"file type" : "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
"comment": "Files with the following endings are Documentation licensed.",
"file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json"],
"location":{
"": {
"comment": "",
"file type": "documentation",
"spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
}
}
},
{
"comment" : ["All other files",
"comment": ["All other files",
"The licensing is defined only by the file location in the Qt module repository.",
"NO <file_pattern_ending> key for this case!",
"This needs to be the last entry of the file."],
"location" : {
"" : {
"comment" : "Default",
"file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
"location": {
"": {
"comment": "Default",
"file type": "module and plugin",
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
},
"src/protobufqttypes/" : {
"comment" : "Qt Protobuf module",
"file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
"src/protobufqttypes/": {
"comment": "Qt Protobuf module",
"file type": "module and plugin",
"spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
},
"src/protobuf/" : {
"comment" : "Qt Protobuf module",
"file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
"src/protobuf/": {
"comment": "Qt Protobuf module",
"file type": "module and plugin",
"spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
},
"src/protobufquick/" : {
"comment" : "Qt ProtobufQuick module",
"file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
"src/protobufquick/": {
"comment": "Qt ProtobufQuick module",
"file type": "module and plugin",
"spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
},
"src/wellknown/" : {
"comment" : "Qt Protobuf module",
"file type" : "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
"src/wellknown/": {
"comment": "Qt Protobuf module",
"file type": "module and plugin",
"spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
},
"src/tools/" : {
"comment" : "Default",
"file type" : "tools and utils",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
"src/tools/": {
"comment": "Default",
"file type": "tools and utils",
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
},
"tests/" : {
"comment" : "Default",
"file type" : "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
"tests/": {
"comment": "Default",
"file type": "test",
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
},
"(.*)(examples/|snippets/)" : {
"comment" : "Default",
"file type" : "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
"(.*)(examples/|snippets/)": {
"comment": "Default",
"file type": "examples and snippets",
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
},
"(.*|examples).*/doc/images" : {
"comment" : "Default",
"file type" : "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
"(.*|examples).*/doc/images": {
"comment": "Default",
"file type": "documentation",
"spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
},
"tests/auto/protobuf/conformance/data/.*.proto" : {
"comment" : "Default",
"file type" : "3rd party",
"spdx" : ["LicenseRef-protobuf"]
"tests/auto/protobuf/conformance/data/.*.proto": {
"comment": "Default",
"file type": "3rd party",
"spdx": ["LicenseRef-protobuf"]
}
}
}