diff options
author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-03-16 12:24:07 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-03-23 11:40:56 +0000 |
commit | 61a7b5b5ba8447cd98a00f036c951763e32cbda6 (patch) | |
tree | 5afcbfbed5d9df0639362a9d3453d4a95b9da0dd /LGPL_EXCEPTION.txt | |
parent | 36d04cbeeddb85075b01cf0ae3e83b3d1e27ddaa (diff) |
Updated licenses & license headers
Added missing LICENSE.LGPLv3
Removed unnesessary license files:
LGPL_EXCEPTION.txt
LICENSE.FDL
LICENSE.LGPL
LICENSE.PREVIEW.COMMERCIAL
Changed LICENSE.GPL from GPLv3 to GPLv2 (as defined in license headers)
Changed license headers from LGPLv21 to LGPLv3 in:
tests/auto/shared/util.h
tests/auto/shared/util.cpp
Task-number: QTBUG-45014
Task-number: QTBUG-45012
Change-Id: Id632067ee359b4737d43be30ff5d5eb9fb44fa93
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'LGPL_EXCEPTION.txt')
-rw-r--r-- | LGPL_EXCEPTION.txt | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt deleted file mode 100644 index 7e2e30ff9..000000000 --- a/LGPL_EXCEPTION.txt +++ /dev/null @@ -1,22 +0,0 @@ -Digia 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. |