Skip to content

Commit dd539e9

Browse files
lugerardlugerard
committed
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: I81597d6a4f75b1d27cc1fbcf1abfca6a7dddc577 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
1 parent dc9bbbb commit dd539e9

File tree

2 files changed

+77
-65
lines changed

2 files changed

+77
-65
lines changed

‎REUSE.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only"
1515

1616
[[annotations]]
1717
path = ["**.pro", "**.pri", "**.qrc", ".cmake.conf", "**.yaml",
18-
"**BLACKLIST", "qt_cmdline.cmake", "**ci_config_linux.json"]
18+
"**BLACKLIST", "qt_cmdline.cmake", "**ci_config_linux.json", ".tag"]
1919
precedence = "closest"
2020
comment = "build system"
2121
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
2222
SPDX-License-Identifier = "BSD-3-Clause"
2323

2424
[[annotations]]
25-
path = [".tag", "**/.gitattributes", "**.gitignore"]
25+
path = ["**/.gitattributes", "**.gitignore", "**.gitreview"]
2626
precedence = "closest"
2727
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
28-
SPDX-License-Identifier = "BSD-3-Clause"
28+
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
2929

3030
[[annotations]]
3131
path = ["examples/**"]
@@ -46,7 +46,7 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-on
4646
path = ["**.toml", "licenseRule.json"]
4747
precedence = "override"
4848
SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
49-
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
49+
SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause"
5050

5151
[[annotations]]
5252
path = ["**/qt_attribution.json"]

‎licenseRule.json

+73-61
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"comment" : ["file_pattern_ending: strings matched against the end of a file name.",
3+
"comment": ["file_pattern_ending: strings matched against the end of a file name.",
44
"location keys: regular expression matched against the beginning of",
55
"the file path (relative to the git submodule root).",
66
"spdx: list of SPDX-License-Expression's allowed in the matching files.",
@@ -9,93 +9,105 @@
99
"unless they are examples",
1010
"Files with other endings can also be build system files"
1111
],
12-
"file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
12+
"file_pattern_ending": ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf",
1313
"configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in",
14-
".cmake.conf", ".gitattributes", ".gitignore", ".tag", "ci_config_linux.json",
14+
".cmake.conf", ".tag", "ci_config_linux.json",
1515
".yaml", ".qrc", "BLACKLIST"],
16-
"location" : {
17-
"" : {
18-
"comment" : "Default",
19-
"file type" : "build system",
20-
"spdx" : ["BSD-3-Clause"]
16+
"location": {
17+
"": {
18+
"comment": "Default",
19+
"file type": "build system",
20+
"spdx": ["BSD-3-Clause"]
2121
},
22-
"(.*)(examples/|snippets/)" : {
23-
"comment" : "Example takes precedent",
24-
"file type" : "examples and snippets",
25-
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
22+
"(.*)(examples/|snippets/)": {
23+
"comment": "Example takes precedent",
24+
"file type": "examples and snippets",
25+
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
2626
}
2727
}
2828
},
2929
{
30-
"comments" : ["Files with the following endings are Tool licensed,",
30+
"comments": ["Files with the following endings are infrastructure licensed"],
31+
"file_pattern_ending": [".gitattributes", ".gitignore", ".gitmodules", ".gitreview",
32+
"_clang-format", "licenseRule.json", "REUSE.toml"],
33+
"location":{
34+
"": {
35+
"comment": "Default",
36+
"file type": "infrastructure",
37+
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
38+
}
39+
}
40+
},
41+
{
42+
"comments": ["Files with the following endings are Tool licensed,",
3143
"unless they are examples.",
3244
"Files with other endings can also be tool files."],
33-
"file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"],
34-
"location" :{
35-
"" : {
36-
"comment" : "Default",
37-
"file type" : "tools and utils",
38-
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
45+
"file_pattern_ending": [".sh", ".py", ".pl", ".bat", ".ps1"],
46+
"location":{
47+
"": {
48+
"comment": "Default",
49+
"file type": "tools and utils",
50+
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"]
3951
},
40-
"(.*)(examples/|snippets/)" : {
41-
"comment" : "Example takes precedent",
42-
"file type" : "examples and snippets",
43-
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
52+
"(.*)(examples/|snippets/)": {
53+
"comment": "Example takes precedent",
54+
"file type": "examples and snippets",
55+
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
4456
}
4557
}
4658
},
4759
{
48-
"comment" : "Files with the following endings are Documentation licensed.",
49-
"file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
50-
"REUSE.toml", "licenseRule.json", ".css", ".metainfo"],
51-
"location" :{
52-
"" : {
53-
"comment" : "",
54-
"file type" : "documentation",
55-
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
60+
"comment": "Files with the following endings are Documentation licensed.",
61+
"file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", "README", "qt_attribution.json",
62+
".css", ".metainfo"],
63+
"location":{
64+
"": {
65+
"comment": "",
66+
"file type": "documentation",
67+
"spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
5668
}
5769
}
5870
},
5971
{
60-
"comment" : ["All other files",
72+
"comment": ["All other files",
6173
"The licensing is defined only by the file location in the Qt module repository.",
6274
"NO <file_pattern_ending> key for this case!",
6375
"This needs to be the last entry of the file."],
64-
"location" : {
65-
"" : {
66-
"comment" : "Default",
67-
"file type" : "module and plugin",
68-
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
76+
"location": {
77+
"": {
78+
"comment": "Default",
79+
"file type": "module and plugin",
80+
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
6981
},
70-
"dist/" : {
71-
"comment" : "Default",
72-
"file type" : "documentation",
73-
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
82+
"dist/": {
83+
"comment": "Default",
84+
"file type": "documentation",
85+
"spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
7486
},
75-
"src/" : {
76-
"comment" : "Default",
77-
"file type" : "module and plugin",
78-
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
87+
"src/": {
88+
"comment": "Default",
89+
"file type": "module and plugin",
90+
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
7991
},
80-
"plugins/" : {
81-
"comment" : "Default",
82-
"file type" : "module and plugin",
83-
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
92+
"plugins/": {
93+
"comment": "Default",
94+
"file type": "module and plugin",
95+
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
8496
},
85-
"tests/" : {
86-
"comment" : "Default",
87-
"file type" : "test",
88-
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
97+
"tests/": {
98+
"comment": "Default",
99+
"file type": "test",
100+
"spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"]
89101
},
90-
"(.*)(examples/|snippets/)" : {
91-
"comment" : "Default",
92-
"file type" : "examples and snippets",
93-
"spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
102+
"(.*)(examples/|snippets/)": {
103+
"comment": "Default",
104+
"file type": "examples and snippets",
105+
"spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"]
94106
},
95-
"(examples|.*).*doc/images/" : {
96-
"comment" : "Default",
97-
"file type" : "documentation",
98-
"spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
107+
"(examples|.*).*doc/images/": {
108+
"comment": "Default",
109+
"file type": "documentation",
110+
"spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"]
99111
}
100112
}
101113
}

0 commit comments

Comments
 (0)