qiurui
/
qt5compat
mirror of https://github.com/qt/qt5compat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Ic8bbbe487a6ea91fef83370419280f15cb24551b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Lucie Gérard 2025-03-10 16:36:08 +01:00
parent f9576fac2a
commit 9c9903baef
2 changed files with 84 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
REUSE.toml
View File

@ -32,18 +32,18 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only"
[[annotations]] [[annotations]]
path = ["**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml", path = ["**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml",
"**ci_config_linux.json"] "**ci_config_linux.json", ".tag"]
precedence = "closest" precedence = "closest"
comment = "build system" comment = "build system"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "BSD-3-Clause" SPDX-License-Identifier = "BSD-3-Clause"
[[annotations]] [[annotations]]
path = [".tag", "**/.gitattributes", "**.gitignore", "**/.gitreview"] path = ["**/.gitattributes", "**.gitignore", "**.gitreview"]
precedence = "closest" precedence = "closest"
comment = "version control system. Licensed as build system" comment = "infrastructure"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." 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]] [[annotations]]
path = ["examples/core5/widgets/tools/codecs/encodedfiles/*.txt", path = ["examples/core5/widgets/tools/codecs/encodedfiles/*.txt",
@ -62,10 +62,10 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-on
[[annotations]] [[annotations]]
path = ["**.toml", "licenseRule.json"] path = ["**.toml", "licenseRule.json"]
comment = "documentation" comment = "infrastructure"
precedence = "override" precedence = "override"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." 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]] [[annotations]]
path = ["**/qt_attribution.json"] path = ["**/qt_attribution.json"]

145
licenseRule.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", "location keys: regular expression matched against the beginning of",
"the file path (relative to the git submodule root).", "the file path (relative to the git submodule root).",
"spdx: list of SPDX-License-Expression's allowed in the matching files.", "spdx: list of SPDX-License-Expression's allowed in the matching files.",
@ -9,98 +9,109 @@
"unless they are examples", "unless they are examples",
"Files with other endings can also be build system files" "Files with other endings can also be build system files"
], ],
"file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", "configure", "file_pattern_ending": ["CMakeLists.txt", ".cmake", ".pro", "configure",
".cmake.conf", ".gitattributes", ".gitignore", ".cmake.conf", ".tag", "ci_config_linux.json", ".yaml",
".tag", "ci_config_linux.json", ".yaml", ".qrc", ".qrc"],
".gitreview"], "location": {
"location" : { "": {
"" : { "comment": "File with other endings also belong to the build system file type",
"comment" : "File with other endings also belong to the build system file type", "file type": "build system",
"file type" : "build system", "spdx": ["BSD-3-Clause"]
"spdx" : ["BSD-3-Clause"]
}, },
"(.*)(examples/|snippets/)" : { "(.*)(examples/|snippets/)": {
"comment" : "Example takes precedence", "comment": "Example takes precedence",
"file type" : "examples and snippets", "file type": "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "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.", "unless they are examples.",
"Files with other endings can also be tool files."], "Files with other endings can also be tool files."],
"file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], "file_pattern_ending": [".sh", ".py", ".pl", ".bat", ".ps1"],
"location" :{ "location":{
"" : { "": {
"comment" : "", "comment": "",
"file type" : "tools", "file type": "tools",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
}, },
"(.*)(examples/|snippets/)" : { "(.*)(examples/|snippets/)": {
"comment" : "Example takes precedence", "comment": "Example takes precedence",
"file type" : "examples and snippets", "file type": "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
} }
} }
}, },
{ {
"comment" : "Files with the following endings are Documentation licensed.", "comment": "Files with the following endings are Documentation licensed.",
"file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".qdoc.sample", "README.md", "file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", ".qdoc.sample", "README.md",
"README", "qt_attribution.json", "REUSE.toml", "licenseRule.json"], "README", "qt_attribution.json"],
"location" :{ "location":{
"" : { "": {
"comment" : "", "comment": "",
"file type" : "documentation", "file type": "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] "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.", "The licensing is defined only by the file location in the Qt module repository.",
"NO <file_pattern_ending> key for this case!", "NO <file_pattern_ending> key for this case!",
"This needs to be the last entry of the file."], "This needs to be the last entry of the file."],
"location" : { "location": {
"" : { "": {
"comment" : "", "comment": "",
"file type" : "module and plugin", "file type": "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] "spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
}, },
"dist/" : { "dist/": {
"comment" : "Default", "comment": "Default",
"file type" : "documentation", "file type": "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
}, },
"src/" : { "src/": {
"comment" : "", "comment": "",
"file type" : "module and plugin", "file type": "module and plugin",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] "spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
}, },
"tests/" : { "tests/": {
"comment" : "", "comment": "",
"file type" : "test", "file type": "test",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
}, },
"(.*)(examples/|snippets/)" : { "(.*)(examples/|snippets/)": {
"comment" : "Default", "comment": "Default",
"file type" : "examples and snippets", "file type": "examples and snippets",
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
}, },
"(.*|examples).*doc/images/" : { "(.*|examples).*doc/images/": {
"comment" : "Default", "comment": "Default",
"file type" : "documentation", "file type": "documentation",
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
}, },
"util/" : { "util/": {
"comment" : "Default", "comment": "Default",
"file type" : "util", "file type": "util",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
}, },
"src/core5/codecs/(qbig5codec|qeucjpcodec|qeuckrcodec|qgb18030codec|qjiscodec|qsjiscodec|qtsciicodec).cpp" : { "src/core5/codecs/(qbig5codec|qeucjpcodec|qeuckrcodec|qgb18030codec|qjiscodec|qsjiscodec|qtsciicodec).cpp": {
"comment" : "license from REUSE.toml not visible when checking the headers", "comment": "license from REUSE.toml not visible when checking the headers",
"file type" : "3rd party mix", "file type": "3rd party mix",
"spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only AND BSD-2-Clause", "spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only AND BSD-2-Clause",
"LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] "LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"]
} }
} }