1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update licensing of files with infrastructure type

Browse Source 
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.8
Change-Id: Ia7b9ae097ff80bd184256e0b7efa0dd7cfa63def
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit e70d7e611e3f3a02c56ae60001edad046a34fc62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lucie Gérard 2025-03-10 20:03:59 +01:00 committed by Qt Cherry-pick Bot
parent ed75628c37
commit 5fb7e0ccbb
2 changed files with 513 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
REUSE.toml
View File

@ -26,7 +26,7 @@ path = ["bin/*", "coin/**","libexec/*","**_clang-format", "**.cmake", "**.conf",
"**.pro", "**.pri", "**.yaml", "cmake/**.in", "cmake/ios/LaunchScreen.storyboard",
"cmake/**md", "**.yml", "**.dynlist", "cmake/**.plist",
"src/corelib/global/qconfig.cpp.in", "src/corelib/Qt6CoreConfigureFileTemplate.in",
"**.cfg", "**/Makefile", "**/CMakeLists.txt", "**.qrc"]
"**.cfg", "**/Makefile", "**/CMakeLists.txt", "**.qrc", ".tag"]
precedence = "closest"
comment = "build system"
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
@ -39,10 +39,10 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
SPDX-License-Identifier = "CC0-1.0"
[[annotations]]
path = [".tag", "**/.gitattributes", "**.gitignore"]
path = ["**/.gitattributes", "**.gitignore", "**.gitreview"]
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 = ["**/snippets/**", "examples/**", "src/tools/qlalr/examples/**"]
@ -103,7 +103,7 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-on
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 = ["**LICENSE*", "cmake/3rdparty/**/COPYING-CMAKE-SCRIPTS"]

22
licenseRule.json
View File

@ -11,7 +11,7 @@
],
"file_pattern_ending": ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
"configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in",
".gitignore", ".gitattributes", "Makefile", ".conf", ".yml", ".cfg", ".yaml",
"Makefile", ".conf", ".yml", ".cfg", ".yaml",
".tag", ".dynlist", ".qrc"],
"location": {
"": {
@ -50,14 +50,26 @@
"spdx": ["BSD-3-Clause"]
},
"tests/auto/tools/rcc/data/legal/legal.qrc": {
"comment" : ["In file licensing not related. Relicensed with reuse.",
"comment": ["In-file licensing not related. Relicensed with reuse.",
"License test can't see the relicensing",
"need first spdx entry to keep in-file license test from failing"],
"Need first spdx entry to keep in-file license test from failing."],
"file type": "build system",
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only","BSD-3-Clause"]
}
}
},
{
"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.",
@ -94,8 +106,8 @@
{
"comment": "Files with the following endings are Documentation licensed.",
"file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
"REUSE.toml", "README.md", "README.txt", "config_help.txt",
"licenseRule.json", "READ-THIS-BEFORE-MANUALLY-ADDING-FILES-TO-PACKAGE.txt"],
"README.md", "README.txt", "config_help.txt",
"READ-THIS-BEFORE-MANUALLY-ADDING-FILES-TO-PACKAGE.txt"],
"location":{
"": {
"comment": "",