Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt-LGPL-exception-1.1: Add new ID for Nokia-Qt-exception-1.1 #627

Merged
merged 4 commits into from
Jun 14, 2018
Merged

Qt-LGPL-exception-1.1: Add new ID for Nokia-Qt-exception-1.1 #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f700cea
Nokia-Qt-exception-1.1: Fix doubled quote ("") typos
wking Mar 23, 2018
a20c078
Qt-LGPL-exception-1.1: Add new ID for Nokia-Qt-exception-1.1
wking Mar 23, 2018
8fc9a4b
Qt-LGPL-exception-1.1: Drop the trailing space from the alt match
wking Mar 25, 2018
b6b27fd
Qt-LGPL-exception-1.1: Order match from longest to shortest
wking Mar 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/exceptions/Nokia-Qt-exception-1.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<exception licenseId="Nokia-Qt-exception-1.1" name="Nokia Qt LGPL exception 1.1">
<exception licenseId="Nokia-Qt-exception-1.1" name="Nokia Qt LGPL exception 1.1" isDeprecated="true" deprecatedVersion="3.1">
<obsoletedBys>
<obsoletedBy>Qt-LGPL-exception-1.1</obsoletedBy>
</obsoletedBys>
<crossRefs>
<crossRef>https://www.keepassx.org/dev/projects/keepassx/repository/revisions/b8dfb9cc4d5133e0f09cd7533d15a4f1c19a40f2/entry/LICENSE.NOKIA-LGPL-EXCEPTION</crossRef>
</crossRefs>
<notes>Typically used by Nokia Qt to apply an exception to LGPL-2.1</notes>
<notes>DEPRECATED: Use Qt-LGPL-exception-1.1</notes>
<text>
<titleText>
<p>Nokia Qt LGPL Exception version 1.1</p>
</titleText>
<p>As an additional permission to the GNU Lesser General Public
License version 2.1, the object code form of a ""work that
uses the Library"" may incorporate material from a header file
License version 2.1, the object code form of a "work that
uses the Library" may incorporate material from a header file
that is part of the Library. You may distribute such object
code under terms of your choice, provided that:</p>
<list>
Expand Down
62 changes: 62 additions & 0 deletions src/exceptions/Qt-LGPL-exception-1.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
<exception licenseId="Qt-LGPL-exception-1.1" name="Qt LGPL exception 1.1" listVersionAdded="3.1">
<crossRefs>
<crossRef>http://code.qt.io/cgit/qt/qtbase.git/tree/LGPL_EXCEPTION.txt</crossRef>
</crossRefs>
<notes>Used with the LGPL-2.1, which is mentioned explicitly in the exception text.</notes>
<text>
<titleText>
<p><alt name="nokia" match="The Qt Company|Nokia|">The Qt Company</alt> Qt LGPL Exception version 1.1</p>
</titleText>
<p>As an additional permission to the GNU Lesser General Public
License version 2.1, the object code form of a "work that
uses the Library" may incorporate material from a header file
that is part of the Library. You may distribute such object
code under terms of your choice, provided that:</p>
<list>
<item>
<bullet>(i)</bullet>
the header files of the Library have not been modified; and
</item>
<item>
<bullet>(ii)</bullet>
the incorporated material is limited to numerical
parameters, data structure layouts, accessors, macros,
inline functions and templates; and
</item>
<item>
<bullet>(iii)</bullet>
you comply with the terms of Section 6 of the GNU Lesser
General Public License version 2.1.
</item>
</list>
<p>Moreover, you may apply this exception to a modified
version of the Library, provided that such
modification does not involve copying material from
the Library into the modified Library's header files
unless such material is limited to</p>
<list>
<item>
<bullet>(i)</bullet>
numerical parameters;
</item>
<item>
<bullet>(ii)</bullet>
data structure layouts;
</item>
<item>
<bullet>(iii)</bullet>
accessors; and
</item>
<item>
<bullet>(iv)</bullet>
small macros, templates and inline functions of five
lines or less in length.
</item>
</list>
<p>Furthermore, you are not required to apply this additional
permission to a modified version of the Library.</p>
</text>
</exception>
</SPDXLicenseCollection>
2 changes: 1 addition & 1 deletion test/simpleTestForGenerator/Nokia-Qt-exception-1.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Nokia Qt LGPL Exception version 1.1

As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a ""work that uses the Library"" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that:
As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate material from a header file that is part of the Library. You may distribute such object code under terms of your choice, provided that:

(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates; and
Expand Down
22 changes: 22 additions & 0 deletions test/simpleTestForGenerator/Qt-LGPL-exception-1.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The Qt Company Qt LGPL Exception version 1.1

As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.

Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.

Furthermore, you are not required to apply this additional permission to a
modified version of the Library.