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 /src/3rdparty/webkit | |
| 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 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc index 09dfae5..411762a 100644 --- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -25,13 +25,10 @@ Qt Commercial Edition licensees that wish to distribute applications that use the QtWebKit module need to be aware of their obligations under the - GNU Lesser General Public License (LGPL). + 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; version 2.1 - for applications and libraries licensed under the GNU GPL version 2, - or version 3 for applications and libraries licensed under the GNU - GPL version 2. + the module under the appropriate version of the GNU LGPL. \legalese WebKit is licensed under the GNU Library General Public License. |