Skip to content

Commit a20c078

Browse files
wkingwking
committed
Qt-LGPL-exception-1.1: Add new ID for Nokia-Qt-exception-1.1
And deprecate the old ID, which had two problems [1]: * Qt no longer belongs to Nokia, and they've changed the title upstream to reflect that. * Qt has another exception for GPL3, and the old ID didn't mention the target license. This commit adds the new identifier and deprecates the old one in its favor. I've used Qt-LGPL-exception-1.1 instead of Kai's suggested Qt-exception-LGPL-1.1 to match the {name}-{target}-exception-{version} pattern suggested by the existing i2p-gpl-java-exception. I've set an <alt> in the exception title so it will match the old "Nokia " prefix, the current "The Qt Company " prefix, or no prefix at all. I've used "The Qt Company " prefix in the test file to match the upstream text (the test is a copy/paste of the upstream text with trailing whitespace removed). [1]: https://lists.spdx.org/pipermail/spdx-legal/2018-March/002511.html Subject: New License/Exception Request: Qt-LGPL-exception-1.1 Date: Fri, 23 Mar 2018 15:39:54 +0000 Message-ID: <HE1PR0202MB2571F0B9F0305FA2150A428F98A80@HE1PR0202MB2571.eurprd02.prod.outlook.com>
1 parent f700cea commit a20c078

File tree

3 files changed

+89
-2
lines changed

3 files changed

+89
-2
lines changed

‎src/exceptions/Nokia-Qt-exception-1.1.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3-
<exception licenseId="Nokia-Qt-exception-1.1" name="Nokia Qt LGPL exception 1.1">
3+
<exception licenseId="Nokia-Qt-exception-1.1" name="Nokia Qt LGPL exception 1.1" isDeprecated="true" deprecatedVersion="3.1">
4+
<obsoletedBys>
5+
<obsoletedBy>Qt-LGPL-exception-1.1</obsoletedBy>
6+
</obsoletedBys>
47
<crossRefs>
58
<crossRef>https://www.keepassx.org/dev/projects/keepassx/repository/revisions/b8dfb9cc4d5133e0f09cd7533d15a4f1c19a40f2/entry/LICENSE.NOKIA-LGPL-EXCEPTION</crossRef>
69
</crossRefs>
7-
<notes>Typically used by Nokia Qt to apply an exception to LGPL-2.1</notes>
10+
<notes>DEPRECATED: Use Qt-LGPL-exception-1.1</notes>
811
<text>
912
<titleText>
1013
<p>Nokia Qt LGPL Exception version 1.1</p>

‎src/exceptions/Qt-LGPL-exception-1.1.xml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3+
<exception licenseId="Qt-LGPL-exception-1.1" name="Qt LGPL exception 1.1" listVersionAdded="3.1">
4+
<crossRefs>
5+
<crossRef>http://code.qt.io/cgit/qt/qtbase.git/tree/LGPL_EXCEPTION.txt</crossRef>
6+
</crossRefs>
7+
<notes>Used with the LGPL-2.1, which is mentioned explicitly in the exception text.</notes>
8+
<text>
9+
<titleText>
10+
<p><alt name="nokia" match="|Nokia |The Qt Company ">The Qt Company </alt>Qt LGPL Exception version 1.1</p>
11+
</titleText>
12+
<p>As an additional permission to the GNU Lesser General Public
13+
License version 2.1, the object code form of a "work that
14+
uses the Library" may incorporate material from a header file
15+
that is part of the Library. You may distribute such object
16+
code under terms of your choice, provided that:</p>
17+
<list>
18+
<item>
19+
<bullet>(i)</bullet>
20+
the header files of the Library have not been modified; and
21+
</item>
22+
<item>
23+
<bullet>(ii)</bullet>
24+
the incorporated material is limited to numerical
25+
parameters, data structure layouts, accessors, macros,
26+
inline functions and templates; and
27+
</item>
28+
<item>
29+
<bullet>(iii)</bullet>
30+
you comply with the terms of Section 6 of the GNU Lesser
31+
General Public License version 2.1.
32+
</item>
33+
</list>
34+
<p>Moreover, you may apply this exception to a modified
35+
version of the Library, provided that such
36+
modification does not involve copying material from
37+
the Library into the modified Library's header files
38+
unless such material is limited to</p>
39+
<list>
40+
<item>
41+
<bullet>(i)</bullet>
42+
numerical parameters;
43+
</item>
44+
<item>
45+
<bullet>(ii)</bullet>
46+
data structure layouts;
47+
</item>
48+
<item>
49+
<bullet>(iii)</bullet>
50+
accessors; and
51+
</item>
52+
<item>
53+
<bullet>(iv)</bullet>
54+
small macros, templates and inline functions of five
55+
lines or less in length.
56+
</item>
57+
</list>
58+
<p>Furthermore, you are not required to apply this additional
59+
permission to a modified version of the Library.</p>
60+
</text>
61+
</exception>
62+
</SPDXLicenseCollection>

‎test/simpleTestForGenerator/Qt-LGPL-exception-1.1.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
The Qt Company Qt LGPL Exception version 1.1
2+
3+
As an additional permission to the GNU Lesser General Public License version
4+
2.1, the object code form of a "work that uses the Library" may incorporate
5+
material from a header file that is part of the Library. You may distribute
6+
such object code under terms of your choice, provided that:
7+
(i) the header files of the Library have not been modified; and
8+
(ii) the incorporated material is limited to numerical parameters, data
9+
structure layouts, accessors, macros, inline functions and
10+
templates; and
11+
(iii) you comply with the terms of Section 6 of the GNU Lesser General
12+
Public License version 2.1.
13+
14+
Moreover, you may apply this exception to a modified version of the Library,
15+
provided that such modification does not involve copying material from the
16+
Library into the modified Library's header files unless such material is
17+
limited to (i) numerical parameters; (ii) data structure layouts;
18+
(iii) accessors; and (iv) small macros, templates and inline functions of
19+
five lines or less in length.
20+
21+
Furthermore, you are not required to apply this additional permission to a
22+
modified version of the Library.

0 commit comments

Comments
 (0)