diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 12:42:44 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-18 13:38:18 (GMT) |
commit | f5acbef2c9d7138bd7212198ad078b345e513dc2 (patch) | |
tree | c68d896155f040390af7c2cd86a71f059a55a597 /doc | |
parent | 0bce53ae2e90e27bc8d8f455789acfadfdfdca31 (diff) | |
download | Qt-f5acbef2c9d7138bd7212198ad078b345e513dc2.zip Qt-f5acbef2c9d7138bd7212198ad078b345e513dc2.tar.gz Qt-f5acbef2c9d7138bd7212198ad078b345e513dc2.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>
(cherry picked from commit 1a26e37037d2c3eb9be8cb41e4b11ed185f08b34)
Diffstat (limited to 'doc')
-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 + */ /*! |