aboutsummaryrefslogtreecommitdiffstats
path: root/licenses
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-04-17 15:30:26 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-04-20 12:25:00 +0200
commit48ebff679e5dc084d395b861a1fc4cb21790d51b (patch)
tree14bac9d4468930eff767a96b2a1b3fd69063837b /licenses
parentd17b8cd011c5bca3d73bd37fad242e7206969983 (diff)
licenses: Add LGPL_Exception texts and reference them from LICENSE
* add the license text as they appear in qtbase 5.4 and 5.5 * The-Qt-Company-Qt-LGPL-Exception-1.1 will be used in 5.5 beta recipes I'll introduce shortly * based on patch from Herb Kuta Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'licenses')
-rw-r--r--licenses/Digia-Qt-LGPL-Exception-1.122
-rw-r--r--licenses/The-Qt-Company-Qt-LGPL-Exception-1.122
2 files changed, 44 insertions, 0 deletions
diff --git a/licenses/Digia-Qt-LGPL-Exception-1.1 b/licenses/Digia-Qt-LGPL-Exception-1.1
new file mode 100644
index 00000000..7e2e30ff
--- /dev/null
+++ b/licenses/Digia-Qt-LGPL-Exception-1.1
@@ -0,0 +1,22 @@
+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.
diff --git a/licenses/The-Qt-Company-Qt-LGPL-Exception-1.1 b/licenses/The-Qt-Company-Qt-LGPL-Exception-1.1
new file mode 100644
index 00000000..5cdacb9a
--- /dev/null
+++ b/licenses/The-Qt-Company-Qt-LGPL-Exception-1.1
@@ -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.