diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 12:42:44 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 12:58:20 (GMT) |
| commit | 1a26e37037d2c3eb9be8cb41e4b11ed185f08b34 (patch) | |
| tree | e408c617e3cc09504605e785fd8ede48fb3aa40e /doc/src | |
| parent | d46da3a141ad05c9f7cd7ea94e254980748329da (diff) | |
| download | Qt-1a26e37037d2c3eb9be8cb41e4b11ed185f08b34.zip Qt-1a26e37037d2c3eb9be8cb41e4b11ed185f08b34.tar.gz Qt-1a26e37037d2c3eb9be8cb41e4b11ed185f08b34.tar.bz2 | |
Fix the mentioning of the LGPL licensing of QtScript and QtWebKit
As discussed with the legal team:
* Removed the confusing sentence about the LGPL version.
* Replaced the use of "Lesser" with "Library"
* Use the same notice for QtWebKit and QtScript
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/modules.qdoc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 3abcf7c..ef29990 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -316,6 +316,37 @@ The QtScript module is part of the \l{Qt Full Framework Edition} and the \l{Open Source Versions of Qt}. + + \section1 License Information + + Qt Commercial Edition licensees that wish to distribute applications that + use the QtScript module need to be aware of their obligations under the + GNU Library General Public License (LGPL). + + Developers using the Open Source Edition can choose to redistribute + the module under the appropriate version of the GNU LGPL. + + \legalese + QtScript is licensed under the GNU Library General Public License. + Individual contributor names and copyright dates can be found + inline in the code. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + \endlegalese + */ /*! |