summaryrefslogtreecommitdiffstats
path: root/LGPL_EXCEPTION.txt
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-31 09:51:20 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-31 09:51:20 (GMT)
commita475d029f7dc93534087b8d069b6eb1222389c65 (patch)
treef63219b34d6587349cd312430c57f7bf0d760a9e /LGPL_EXCEPTION.txt
parent309db73299db55a631f4aa2c44e0073c16c865a7 (diff)
downloadQt-a475d029f7dc93534087b8d069b6eb1222389c65.zip
Qt-a475d029f7dc93534087b8d069b6eb1222389c65.tar.gz
Qt-a475d029f7dc93534087b8d069b6eb1222389c65.tar.bz2
Update tech preview license and LGPL Exception.
Reviewed-by: Trust Me
Diffstat (limited to 'LGPL_EXCEPTION.txt')
-rw-r--r--LGPL_EXCEPTION.txt23
1 files changed, 21 insertions, 2 deletions
diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt
index 8d0f85e..8f73eca 100644
--- a/LGPL_EXCEPTION.txt
+++ b/LGPL_EXCEPTION.txt
@@ -1,3 +1,22 @@
-Nokia Qt LGPL Exception version 1.0
+Nokia Qt LGPL Exception version 1.1
-As a special exception 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 the incorporated material (i) does not exceed more than 5% of the total size of the Library; and (ii) is limited to numerical parameters, data structure layouts, accessors, macros, inline functions and templates. \ No newline at end of file
+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.