diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:53:55 +0200 |
commit | 2dd6a5e7ff769e54065ae8b9b532b2e56f2e3116 (patch) | |
tree | 68c7020317d09116871014f1df6545d68ab7f328 /LGPL_EXCEPTION.txt | |
parent | ed4be1f75314ddc004ea7c0d7c6af715252e4e5c (diff) | |
parent | f6b06b37fffdb35c8dd8a9b9cfd0177daae473be (diff) | |
download | qtwebchannel-2dd6a5e7ff769e54065ae8b9b532b2e56f2e3116.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ibd56abaa0b9d9aac275be41209ba2db3fc79e212
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 5cdacb9..0000000 --- a/LGPL_EXCEPTION.txt +++ /dev/null @@ -1,22 +0,0 @@ -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. |