Doc: Update Licensing documentation

Update licensing documentation overview, and reflect changes to Qt
licensing in 5.7.

  - Add GPLv3-licensed add-ons to the table
  - Document three.js license for Qt Canvas 3D
  - Document assimp license for Qt 3D
  - Link to Qt WebEngine documentation on Chromium 3rd-party licenses
  - Remove Qt WebKit licensing information
  - Add links to the top-level licensing page from the subpages

Task-number: QTBUG-51805
Change-Id: I589bd813fac728e8fd2894f7bc92702b53f5692f
Reviewed-by: Sami Makkonen <sami.makkonen@theqtcompany.com>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>

6 files changed, 193 insertions, 573 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index c483016d2..b0cf2993c 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -61,11 +61,6 @@
 */
 
 /*!
-    \externalpage http://www.gnu.org/licenses/gpl.html
-    \title GNU General Public License (GPL)
-*/
-
-/*!
     \externalpage http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
     \title GNU Lesser General Public License, version 2.1
 */
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 6c14042fc..d420f01ac 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -34,8 +34,9 @@
 
     Qt includes a number of third-party libraries that are used to provide
     certain features. Unlike the code described in the
-    \l{Other Licenses Used in Qt}{code used in Qt} document, these
-    libraries are supplied alongside the Qt modules.
+    \l{Other Licenses Used in Qt} document, these libraries are supplied
+    alongside the Qt modules. For an overview of Qt licensing and a list of
+    all third-party code in Qt, see \l {Qt Licensing}.
 
     Third Party Software may impose additional restrictions and it is the
     user's responsibility to ensure that they have met the licensing
@@ -76,6 +77,93 @@
     MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
     \endcode
 
+    \section1 assimp 3.1.1
+
+    \e {assimp} (Open Asset Import Library) is a portable open source
+    library to import various well-known 3D model formats in a uniform
+    manner.
+
+    \badcode
+    Open Asset Import Library (assimp)
+
+    Copyright (c) 2006-2012, assimp team
+    All rights reserved.
+
+    Redistribution and use of this software in source and binary forms,
+    with or without modification, are permitted provided that the
+    following conditions are met:
+
+    * Redistributions of source code must retain the above
+      copyright notice, this list of conditions and the
+      following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the
+      following disclaimer in the documentation and/or other
+      materials provided with the distribution.
+
+    * Neither the name of the assimp team, nor the names of its
+      contributors may be used to endorse or promote products
+      derived from this software without specific prior
+      written permission of the assimp team.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+    ******************************************************************************
+
+    AN EXCEPTION applies to all files in the ./test/models-nonbsd folder.
+    These are 3d models for testing purposes, from various free sources
+    on the internet. They are - unless otherwise stated - copyright of
+    their respective creators, which may impose additional requirements
+    on the use of their work. For any of these models, see
+    <model-name>.source.txt for more legal information. Contact us if you
+    are a copyright holder and believe that we credited you inproperly or
+    if you don't want your files to appear in the repository.
+
+
+    ******************************************************************************
+
+    Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
+    http://code.google.com/p/poly2tri/
+
+    All rights reserved.
+    Redistribution and use in source and binary forms, with or without modification,
+    are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of Poly2Tri nor the names of its contributors may be
+      used to endorse or promote products derived from this software without specific
+      prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    \endcode
+
     \section1 forkfd
 
     \e{forkfd} is a tool to facilitate spawning sub-processes on Unix systems.
@@ -1262,6 +1350,35 @@
 
     See \c qtimageformats/src/3rdparty/libtiff/README for license details.
 
+    \section1 three.js
+
+    A JavaScript 3D library.
+
+    \badcode
+    The MIT License
+
+    Copyright © 2010-2015 three.js authors
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+    \endcode
+    -- quoted from \c qtcanvas3d/examples/canvas3d/3rdparty/three.js
+
     \section1 Three.js Loader
 
     A parser for loading 3D models from JSON data structures.
@@ -1286,7 +1403,7 @@
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
     \endcode
-    -- quoted from \c qtcanvas3d/3rdparty/ThreeJSLoader.js
+    -- quoted from \c qtcanvas3d/examples/canvas3d/3rdparty/ThreeJSLoader.js
 
     \section1 Traditional Chinese IME (tcime)
 
@@ -1585,189 +1702,6 @@
     See \c qtbase/src/3rdparty/pixman/pixman-arm-neon-asm.h and
     \c qtbase/src/3rdparty/pixman/pixman-arm-neon-asm.S
 
-    \section1 WebCore (WebKit)
-
-    Copyright (C) 2009 Ericsson AB\br
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.\br
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer
-       in the documentation and/or other materials provided with the
-       distribution.\br
-    3. Neither the name of Ericsson nor the names of its contributors
-       may be used to endorse or promote products derived from this
-       software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \hr
-
-    Copyright (C) 2004, Apple Computer, Inc. and The Mozilla Foundation.\br
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.\br
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.\br
-    3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
-    Foundation ("Mozilla") nor the names of their contributors may be used
-    to endorse or promote products derived from this software without
-    specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS
-    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR
-    THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \hr
-
-    Copyright (C) 2009 Igalia S.L.\br
-    Copyright (C) 2009 Antonio Gomes <tonikitoo@webkit.org>\br
-    Copyright (C) 2008 Christian Dywan <christian@imendio.com>\br
-    Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>\br
-    Copyright (C) 2006 Charles Samuels <charles@kde.org>\br
-    Copyright (C) 2009 Dominik Röttsches <dominik.roettsches@access-company.com>\br
-    Copyright (C) 2009 Brent Fulgham\br
-    Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in>\br
-    Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>\br
-    Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>\br
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:\br
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.\br
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \hr
-
-    Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.\br
-    Copyright (C) IBM Corp. 2009  All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1.  Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.\br
-    2.  Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.\br
-    3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
-        its contributors may be used to endorse or promote products derived
-        from this software without specific prior written permission.\br
-
-    THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \hr
-
-    Copyright (C) 2009 Alex Milowski (alex@milowski.com). All rights reserved.\br
-    Copyright (C) 2010 François Sausset (sausset@gmail.com). All rights reserved\br
-    Copyright (C) 2007 Marius Renn <damarvy@gmail.com> All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:\br
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.\br
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \hr
-
-        jquery 1.4.2.js Copyright 2010 John Resig
-        This software is dual licensed under the MIT or GPL version 2 licenses.
-        Digia has used the software herein under the MIT license.
-
-        jquery includes Sizzle.js Copyright 2010 The Dojo Foundaton and is
-        licensed under the MIT, BSD and GPL licenses.  Digia has used this
-        software herein under the MIT license.
-
-        The MIT License
-
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-
-        The above copyright notice and this permission notice shall be included in
-        all copies or substantial portions of the Software.
-
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-        THE SOFTWARE.
-
-
     \section1 The Public Suffix List
 
     \e{The Public Suffix List is an initiative of the Mozilla Project, but is
diff --git a/doc/src/legal/commerciallicense.qdoc b/doc/src/legal/commerciallicense.qdoc
index 1bc6aad2e..31b865970 100644
--- a/doc/src/legal/commerciallicense.qdoc
+++ b/doc/src/legal/commerciallicense.qdoc
@@ -33,18 +33,16 @@
     Qt licensed under our commercial license agreement is appropriate for development
     of proprietary/commercial software where you do not want to share any source code
     with third parties or otherwise cannot comply with the terms of the
-    \l{GNU Lesser General Public License (LGPL)} GNU LGPL version 3 or version 2.1.
+    \l{GNU Lesser General Public License (LGPL)} GNU LGPL version 3.
 
     You can find more information on \l{http://qt.io/licensing/}.
 
     \section1 Purchasing and Sales Information
 
     To purchase or further information and assistance about Qt Commercial licensing,
-    please contact our sales via one of the following channels:
+    please contact our sales:
 
-    \table
-    \row \li Web: \li \l{http://qt.io/contact-us/}
-    \row \li Phone, U.S. office (for sales in North America): \li \b{+1 408 433 9320}
-    \row \li Phone, Norway office (for sales in the rest of the world): \li \b{+47 2108 0420}
-    \endtable
+    \list
+      \li \l{http://www.qt.io/contact-us/}
+    \endlist
 */
diff --git a/doc/src/legal/lgpl.qdoc b/doc/src/legal/gpl.qdoc
index 5596af7cf..6ad8ee84c 100644
--- a/doc/src/legal/lgpl.qdoc
+++ b/doc/src/legal/gpl.qdoc
@@ -25,35 +25,39 @@
 **
 ****************************************************************************/
 
+/*!
+    \page gpl.html
+    \title GNU General Public License (GPL)
+    \brief About the GPL license used for Qt.
+
+    Qt is available under the GNU General Public License version 3.
+
+    The Qt Toolkit is Copyright (C) 2016 The Qt Company Ltd. and other contributors.\br
+    Contact: \l http://www.qt.io/licensing/
+
+    Reference:
+    \list
+      \li \l{http://www.gnu.org/licenses/gpl.html}{GNU General Public License (GPL), version 3}
+    \endlist
+
+    \section1 GPL version 3
+    \snippet snippets/code/doc_src_gpl.qdoc GPL v3
+*/
+
 /*! \page lgpl.html
     \title GNU Lesser General Public License (LGPL)
-    \brief About the LGPL licenses used for Qt.
+    \brief About the LGPL license used for Qt.
 
-    Qt is available under the GNU Lesser General Public License version 3
-    and the GNU Lesser General Public License version 2.1.
+    Qt is available under the GNU Lesser General Public License version 3.
 
-    The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd and other contributors.\br
-    Contact: http://www.qt.io/licensing/
+    The Qt Toolkit is Copyright (C) 2016 The Qt Company Ltd. and other contributors.\br
+    Contact: \l http://www.qt.io/licensing/
 
-    References:
+    Reference:
     \list
-      \li \l{GNU Lesser General Public License, version 2.1}
       \li \l{GNU Lesser General Public License, version 3}
     \endlist
 
     \section1 LGPL version 3
     \snippet snippets/code/doc_src_lgpl3.qdoc LGPL v3
-
-    \section1 LGPL version 2.1
-    \snippet snippets/code/doc_src_lgpl.qdoc LGPL v2.1
-
-    \section1 The Qt Company Qt LGPL Exception version 1.1
-
-    As a special exception 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 the incorporated material
-    (i) does not exceed more than 5% of the total size of the Library;  and
-    (ii) is limited to numerical parameters, data structure layouts, accessors,
-    macros, inline functions and templates.
 */
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index cccaa86ef..0682d6829 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -37,22 +37,18 @@
       \li Qt licensed under \e commercial licenses are appropriate for
           development of proprietary/commercial software where you do not want
           to share any source code with third parties or otherwise cannot
-          comply with the terms of the GNU LGPL version 3 or the GNU LGPL
-          version 2.1.
+          comply with the terms of the GNU LGPL version 3.
 
       \li Qt licensed under the \l{GNU Lesser General Public License (LGPL)}
           version 3 is appropriate for the development of Qt applications
           provided you can comply with the terms and conditions of the GNU LGPL
           version 3 (or GNU GPL version 3).
-
-      \li Qt licensed under the \l{GNU Lesser General Public License (LGPL)}
-          version 2.1 is appropriate for the development of Qt applications
-          provided you can comply with the terms and conditions of the GNU LGPL
-          version 2.1.
     \endlist
 
     \note Some specific parts (modules) of the Qt framework are not available
-    under the GNU LGPL version 2.1. See \l {Licenses Used in Qt} for details.
+    under the GNU LGPL version 3, but under the
+    \l {GNU General Public License (GPL)} instead. See \l {Licenses Used in Qt}
+    for details.
 
     \e {Qt documentation} is licensed under the terms of the \l{GNU Free
     Documentation License (FDL)} version 1.3, as published by the Free Software
@@ -183,8 +179,8 @@
     \row \li \li \li \li
 
     \row \li {1,6} Qt Canvas 3D
-    \row \li \l{GNU Lesser General Public License (LGPL)} version 3 \li \li LGPL v3 \li
     \row \li {4,1} \b{Third-party Licenses}
+    \row \li \l{three.js} \li JavaScript 3D library \li MIT \li (Used in example code)
     \row \li \l{Three.js Loader}
          \li A parser for loading 3D models from JSON data structures.
          \li MIT \li (Used in example code).
@@ -258,19 +254,10 @@
 
     \row \li \l[QtWebEngineCore]{Qt WebEngine Core}
          \li \li LGPL v3 or\br GPL v2 + Qt commercial license \li
-    \row \li \li \li \li
-    \row \li \li \li \li
-
-    \row \li {1,6} Qt WebKit
-
-    \row \li \l{WebKit used by the QtWebKit module}
-         \li Parts of WebKit used by the QtWebKit module \li BSD-style \li Depends on Qt Gui, Qt Network, Qt SQL, Qt QML, and Qt Quick
-
     \row \li {4,1} \b{Third-party Licenses}
-    \row \li \l{WebCore (WebKit)}{WebCore}
-         \li A layout, rendering, and Document Object Model (DOM) library for HTML and SVG. \li LGPL, MIT, BSD-style \li
-    \row \li \li \li \li
-    \row \li \li \li \li
+    \row \li \l {Qt WebEngine Licensing}{Chromium} \li Third-party licenses in Chromium
+         \li LGPLv2.1, BSD, BSL, Apache, APSL, MIT, MPL, others
+         \li See \l {Qt WebEngine Licensing} for details.
 
     \row \li {1,4} Qt Designer
 
@@ -314,6 +301,12 @@
     \row \li \li \li \li
     \row \li \li \li \li
 
+    \row \li {1,4} Qt 3D
+    \row \li {4,1} \b{Third-party Licenses}
+    \row \li \l {assimp 3.1.1}{assimp}
+         \li Open Asset Import Library \li BSD \li
+    \row \li \li \li \li
+
     \row \li {1,10} Plugins
 
     \row \li \l{JPEG Software (libjpeg) version 8c}{JPEG}
@@ -339,43 +332,57 @@
     \row \li \l{Clucene Core Library}
          \li A high-performance, full-featured text search engine written in C++. \li LGPL/Apache \li
 
-    \row \li {1,6} Qt Virtual Keyboard
+    \endtable
+
+    The following modules are available under the GNU GPL version 3 and commercial licenses:
+
+    \table
+    \header \li Qt Module/Tool \li Component \li Description \li License Type
+
+    \row \li {1,2} Qt Charts \li \li \li GPLv3 or commercial license
+    \row \li \li \li
+
+    \row \li {1,2} Qt Data Visualization \li \li \li GPLv3 or commercial license
+    \row \li \li \li
 
+    \row \li {1,2} Qt Purchasing \li \li \li GPLv3 or commercial license
+    \row \li \li \li
+
+    \row \li {1,6} Qt Virtual Keyboard \li \li \li GPLv3 or commercial license
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{Lipi Toolkit (LipiTk)}{Lipi Toolkit}
          \li An open source toolkit for online Handwriting  Recognition (HWR).
-         \li MIT-Style License \li
+         \li MIT-Style License
 
     \row \li \l{OpenWnn}
          \li A Japanese IME
-         \li Apache License \li
+         \li Apache License
 
     \row \li \l{Pinyin}
          \li An IME for Standard Chinese input.
-         \li Apache License \li
+         \li Apache License
 
     \row \li \l{Traditional Chinese IME (tcime)}{tcime}
          \li A traditional Chinese IME.
-         \li Apache License \li
-
-    \row \li {1,6} Qt Quick 2D Renderer
+         \li Apache License
 
+    \row \li {1,6} Qt Quick 2D Renderer \li \li \li GPLv3 or commercial license
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{EGL 1.5 Headers}
          \li These headers are based on EGL 1.5 specification.
-         \li MIT License \li
+         \li MIT License
 
     \row \li \l{OpenGL ES 2.0 Headers}
          \li These headers are based on OpenGL ES 2.0 specification.
-         \li MIT and SGI License \li
+         \li MIT and SGI License
 
     \row \li \l{OpenGL ES 3.1 Headers}
          \li These headers are based on OpenGL ES 3.1 specification.
-         \li MIT and SGI License \li
+         \li MIT and SGI License
 
     \row \li \l{OpenKODE Core 1.0 Header}
          \li The header is based on OpenKODE Core 1.0 specification.
-         \li MIT License \li
+         \li MIT License
 
     \endtable
 
@@ -398,6 +405,9 @@
     This page lists the licenses used, names the authors, and links
     to the places where it is used.
 
+    For an overview of Qt licensing and a list of all third-party code in Qt,
+    see \l {Qt Licensing}.
+
     The Qt Company gratefully acknowledges these and other contributions
     to Qt. We recommend that programs that use Qt also acknowledge
     these contributions, and quote these license statements in an
@@ -719,326 +729,6 @@
     \li ANGLE library in qtbase/src/3rdparty/angle
     \endlist
 
-
-    \section1 WebKit used by the QtWebKit module
-
-    Copyright (c) 2007-2008, Apple, Inc.\br
-    Copyright (C) 2008 Cameron Zwarich <cwzwarich@uwaterloo.ca>\br
-    Copyright (C) 2009 Google Inc. All rights reserved.\br
-    Copyright (C) 2008, 2009 Paul Pedriana <ppedriana@ea.com>. All rights reserved.\br
-    Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)\br
-    Copyright (C) 2009 Jian Li <jianli@chromium.org>\br
-    Copyright (C) 2007 Staikos Computing Services Inc.\br
-    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)\br
-    Copyright (C) 2008 Nuanti Ltd.\br
-    Copyright (C) 2007 David Smith (catfish.man@gmail.com)\br
-    Copyright (C) 2008 Tony Chang <idealisms@gmail.com>\br
-    Copyright (C) 2007 Graham Dennis (graham.dennis@gmail.com)
-
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-      * Redistributions of source code must retain the above copyright notice,
-        this list of conditions and the following disclaimer.
-
-      * Redistributions in binary form must reproduce the above copyright notice,
-        this list of conditions and the following disclaimer in the documentation
-        and/or other materials provided with the distribution.
-
-      * Neither the name of Apple, Inc. nor the names of its contributors
-        may be used to endorse or promote products derived from this software
-        without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
-    \hr
-
-    Copyright (C) 2000-2004, International Business Machines\br
-    Corporation and others. All Rights Reserved.\br
-    Copyright (C) 2007 Apple Inc. All rights reserved.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this
-    software and associated documentation files (the "Software"), to deal in the Software
-    without restriction, including without limitation the rights to use, copy, modify,
-    merge, publish, distribute, and/or sell copies of the Software, and to permit persons
-    to whom the Software is furnished to do so, provided that the above copyright notice(s)
-    and this permission notice appear in all copies of the Software and that both the above
-    copyright notice(s) and this permission notice appear in supporting documentation.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-    INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-    PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER
-    OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-    CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-    PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-    OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-    Except as contained in this notice, the name of a copyright holder shall not be used in
-    advertising or otherwise to promote the sale, use or other dealings in this Software
-    without prior written authorization of the copyright holder.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
-    \hr
-
-    Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,\br
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without modification,
-    are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.\br
-        * Redistributions in binary form must reproduce the above copyright notice,
-          this list of conditions and the following disclaimer in the documentation
-          and/or other materials provided with the distribution.\br
-        * Neither the name of the author nor the names of contributors may be used
-          to endorse or promote products derived from this software without specific
-          prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-    ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
-    \hr
-
-    Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.\br
-    Copyright (C) 2007 Eric Seidel <eric@webkit.org>\br
-    Copyright (C) 2008 Kelvin W Sherlock (ksherlock@gmail.com)\br
-    Copyright (C) 2008 Alp Toker <alp@atoker.com>\br
-    Copyright (C) 2009 University of Szeged\br
-    Copyright (C) 2007 Alexey Proskuryakov (ap@nypop.com)\br
-    Copyright (C) 2009 Daniel Bates (dbates@intudata.com)\br
-    Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>\br
-    Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com\br
-    Copyright (C) 2007 Holger Hans Peter Freyther\br
-    Copyright (C) 2008 Collabora Ltd.  All rights reserved.\br
-    Copyright (C) 2006 Dirk Mueller <mueller@kde.org>\br
-    Copyright (C) 2006 Zack Rusin <zack@kde.org>\br
-    Copyright (C) 2006 George Staikos <staikos@kde.org>\br
-    Copyright (C) 2006 Simon Hausmann <hausmann@kde.org>\br
-    Copyright (C) 2006 Rob Buis <buis@kde.org>\br
-    Copyright (C) 2008 Julien Chaffraix <jchaffraix@webkit.org>\br
-    Copyright (C) 2007 Henry Mason (hmason@mac.com)\br
-    Copyright (C) 1999 Lars Knoll (knoll@kde.org)\br
-    Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)\br
-    Copyright (c) 2009 The Android Open Source Project\br
-    Copyright (C) 2008 Dirk Schulze <krit@webkit.org>\br
-    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)\br
-    Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>\br
-    Copyright (C) 2009 280 North Inc. All Rights Reserved.\br
-    Copyright (C) 2009 Joseph Pecoraro\br
-    Copyright (C) 2008 Anthony Ricaud (rik24d@gmail.com)\br
-    Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>\br
-    Copyright (C) 2008 Christian Dywan <christian@imendio.com>\br
-    Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com \br
-    Copyright (C) 2009 Holger Hans Peter Freyther\br
-    Copyright (C) 2008 Google Inc. All rights reserved.\br
-    Copyright (C) 2006 Friedemann Kleint <fkleint@trolltech.com>\br
-    Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>\br
-    Copyright (C) 2008 Collin Jackson  <collinj@webkit.org>\br
-    Copyright (C) 2007 Staikos Computing Services Inc. <info@staikos.net>\br
-    Copyright (C) 2008 Kevin Ollivier <kevino@theolliviers.com> All Rights Reserved.\br
-    Copyright (C) 2005 Frerich Raabe <raabe@kde.org>\br
-    Copyright (C) 2005 Maksim Orlovich <maksim@kde.org>\br
-    Copyright (C) 2005, 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.\br
-    Copyright (C) 2007-2009 Torch Mobile, Inc.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.\br
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
-    \hr
-
-    Copyright (C) 2009 University of Szeged\br
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.\br
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY UNIVERSITY OF SZEGED ``AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL UNIVERSITY OF SZEGED OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-    OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
-    \hr
-
-    Copyright (c) 1997-2005 University of Cambridge. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-
-        * Neither the name of the University of Cambridge nor the name of Apple
-          Inc. nor the names of their contributors may be used to endorse or
-          promote products derived from this software without specific prior
-          written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
-    \hr
-
-                         Originally written by Philip Hazel\br
-               Copyright (c) 1997-2006 University of Cambridge\br
-      Copyright (C) 2007 Eric Seidel <eric@webkit.org>\br
-     Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009 Apple Inc.  All rights reserved.
-
-    -----------------------------------------------------------------------------\br
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-        * Redistributions of source code must retain the above copyright notice,
-          this list of conditions and the following disclaimer.
-
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-
-        * Neither the name of the University of Cambridge nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
-    \hr
-
-    Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.\br
-    Copyright (C) 2008 Google Inc. All rights reserved.\br
-    Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-        * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.\br
-        * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following disclaimer
-    in the documentation and/or other materials provided with the
-    distribution.\br
-        * Neither the name of Google Inc. nor the names of its
-    contributors may be used to endorse or promote products derived from
-    this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    \list
-    \li Parts of WebKit used by the QtWebKit module
-    \endlist
-
     \section1 Unicode
 
     Copyright (c) 1991-2009 Unicode, Inc. All rights reserved.
diff --git a/doc/src/legal/opensourcelicense.qdoc b/doc/src/legal/opensourcelicense.qdoc
index b277fc6eb..6a1c8de4d 100644
--- a/doc/src/legal/opensourcelicense.qdoc
+++ b/doc/src/legal/opensourcelicense.qdoc
@@ -41,9 +41,8 @@
 
     The Qt Company supports the free software concept by providing the Qt Open Source
     Edition, which is licensed under the \l{GNU Lesser General Public License (LGPL)}
-    version 3 and the GNU LGPL version 2.1.
-    You can use this edition of Qt to create and distribute software with licenses
-    that are compatible with these free software licenses.
+    version 3. You can use this edition of Qt to create and distribute software with licenses
+    that are compatible with this free software license.
 
     Additionally, the \l{Qt Examples and Tutorials}{examples} included with Qt are provided under
     the terms of the \l{New and Modified BSD Licenses}{Modified BSD License}.