Doc: Update Qt licensing documentationv5.4.0-beta1

Update the documentation to cover the inclusion of LGPL version 3
licensing option.

Add information about the Apache 2.0 licensed code used for the
Native style for Android.

Add information about the Wayland protocol license for Qt
Wayland.

Fix layout issues in the table describing the other licenses, as
well as a wrong license type listed for Qt Script module.

Fix a number of external links and remove links pointing to
the old download page for commercial Qt versions.

Task-number: QTBUG-41024
Task-number: QTBUG-41798
Change-Id: I203b2ace6cc379da3b0cab12b6197b35c195720c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

14 files changed, 392 insertions, 118 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index b076c3164..8ae4c5e8e 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -51,11 +51,7 @@
 */
 
 /*!
-    \externalpage http://qt-project.org/downloads
-    \title Opensource Downloads
-*/
-/*!
-    \externalpage http://qt.digia.com/licensing/
+    \externalpage http://qt.io/licensing/
     \title Qt Licensing Overview
 */
 
@@ -70,6 +66,11 @@
 */
 
 /*!
+    \externalpage http://www.gnu.org/licenses/lgpl-3.0.html
+    \title GNU Lesser General Public License, version 3
+*/
+
+/*!
     \externalpage http://qt-project.org/faq/answer/how_to_compress_data_with_qt
     \title How to compress data with Qt?
 */
@@ -135,11 +136,7 @@
 */
 
 /*!
-    \externalpage http://qt.digia.com/Try-Buy/
-    \title Try Qt Enterprise
-*/
-/*!
-    \externalpage http://qt.digia.com/
+    \externalpage http://www.qt.io/qt-features/
     \title Qt Enterprise
 */
 /*!
@@ -155,7 +152,7 @@
     \title Android: App Manifest
 */
 /*!
-    \externalpage http://engin.io
+    \externalpage https://qtcloudservices.com/
     \title Enginio Data Storage
 */
 /*!
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 3d51cdf1a..5054593b3 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -36,9 +36,7 @@
     certain modules or add-ons. An \e{offline installer} is a single package
     which contains all of Qt and Add-Ons relevant for a target platform.
 
-    The open-source versions are found at the \l Downloads page
-    and the commercial versions are available for a free trial from
-    \l{Try Qt Enterprise}{Digia}.
+    You can download Qt 5 installers from the \l Downloads page.
 
     You can use the Qt installers to download and install the following
     components:
@@ -111,6 +109,6 @@
 
     \section1 Qt Project Community
 
-    Qt's vibrant and active community site, \l{http://qt-project.org} houses
+    Qt's vibrant and active community site, \l{http://qt.io} houses
     a wiki, a forum, and additional learning guides and presentations.
 */
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 00cdfec40..42c6abc2e 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -39,9 +39,6 @@ There are two ways to install Qt:
 You can download the Qt 5 installers and sources from the \l Downloads page.
 For more information, visit the \l{Getting Started with Qt} page.
 
-
-\note Qt Enterprise packages are available from the \l{Try Qt Enterprise} page.
-
 This page lists the relevant information for installing Qt by building the Qt
 sources. The installation procedure is different on each Qt platform. This page
 collects the relevant information for the \l{Supported Platforms}.
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index e53904c36..d670b89c9 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -39,7 +39,7 @@
 
     Third Party Software may impose additional restrictions and it is the
     user's responsibility to ensure that they have met the licensing
-    requirements of the GPL, LGPL, or Qt Commercial license and the relevant
+    requirements of the LGPL or Qt Commercial license and the relevant
     license of the Third Party Software they are using.
 
     Run \c{configure -help} to see any options that may be available for
@@ -1751,4 +1751,36 @@
     Note that this same license does *not* apply to the CLucene Contributions
     package. You should read the COPYING file in that directory or package for
     more information.
+
+    \section1 Wayland Protocol
+
+    \badcode
+    Copyright © 2008-2011 Kristian Høgsberg
+    Copyright © 2010-2011 Intel Corporation
+
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    the copyright holders not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission.  The copyright holders make no
+    representations about the suitability of this software for any
+    purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR 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.
+    \endcode
+
+    \list
+        \li From \c {qtwayland/src/3rdparty/protocol/wayland.xml}
+    \endlist
 */
diff --git a/doc/src/legal/commerciallicense.qdoc b/doc/src/legal/commerciallicense.qdoc
index 8984003ee..8169e37f3 100644
--- a/doc/src/legal/commerciallicense.qdoc
+++ b/doc/src/legal/commerciallicense.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -33,19 +33,17 @@
     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 2.1} or
-    \l{GNU General Public License (GPL)}{GNU GPL version 3.0}.
+    \l{GNU Lesser General Public License (LGPL)} GNU LGPL version 3 or version 2.1.
 
-    You can find more information on the \l{Qt Licensing Overview} of
-    the \l{http://qt.digia.com}{Digia Qt} Web site.
+    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 Digia Qt sales via one of the following channels:
+    please contact our sales via one of the following channels:
 
     \table
-    \row \li Web: \li \l{http://qt.digia.com/contact-us}
+    \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
diff --git a/doc/src/legal/gpl.qdoc b/doc/src/legal/lgpl.qdoc
index bca9514ac..f3ec6b049 100644
--- a/doc/src/legal/gpl.qdoc
+++ b/doc/src/legal/lgpl.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -25,31 +25,26 @@
 **
 ****************************************************************************/
 
-/*! \page gpl.html
-    \title GNU General Public License (GPL)
-    \brief About the GPL license used for Qt.
-
-    Qt is available under the GPL (version 3).
-
-    The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
-    Contact: \l{http://www.qt-project.org/legal}
-
-    Reference: \l{GNU General Public License}
-
-    \snippet snippets/code/doc_src_gpl.qdoc GPL v3
-*/
-
 /*! \page lgpl.html
     \title GNU Lesser General Public License (LGPL)
-    \brief About the LGPL license used for Qt.
+    \brief About the LGPL licenses used for Qt.
 
-    Qt is available under the LGPL (version 2.1).
+    Qt is available under the GNU Lesser General Public License version 3
+    and the GNU Lesser General Public License version 2.1.
 
-    The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
+    The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
     Contact: http://www.qt-project.org/legal
 
-    Reference: \l{GNU Lesser General Public License, version 2.1}
+    References:
+    \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 Digia Qt LGPL Exception version 1.1
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 50a8225da..e3bdf9225 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -33,45 +33,54 @@
     Qt is available under three different licensing options designed to accommodate
     the needs of our various users.
 
+    \list
+        \li Qt Commercial License
+        \li GNU Lesser General Public License (LGPL) version 3
+        \li GNU Lesser General Public License (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.
+
     Qt licensed under our \l{Qt Commercial License}{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 GNU LGPL
-    version 2.1 or GNU GPL version 3.0.
+    version 3 or the GNU LGPL version 2.1.
+
+    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).
 
     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.
 
-    Qt licensed under the \l{GNU General Public License (GPL)} version 3.0 is
-    appropriate for the development of Qt applications where you wish to use such
-    applications in combination with software subject to the terms of the GNU GPL
-    version 3.0 or where you are otherwise willing to comply with the terms of the
-    GNU GPL version 3.0.
-
     Qt documentation is licensed under the terms of the \l{GNU Free Documentation
     License (FDL)} version 1.3, as published by the Free Software Foundation.
     Alternatively, you may use the documentation in accordance with the terms
     contained in a written agreement between you and Digia.
 
-    Please see \l{http://qt.digia.com/licensing} for an overview of Qt licensing.
+    Please see \l{http://qt.io/licensing/} for an overview of Qt licensing.
 
     \section1 Purchasing and Sales Information
 
     To purchase or further information and assistance about Qt commercial licensing,
-    please contact Digia Qt sales via one of the following channels:
+    please contact our sales via one of the following channels:
 
     \table
-    \row \li Web: \li \l{http://qt.digia.com/contact-us}
+    \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
 
     \section1 Licenses Used in Qt
 
-    The following table lists the \l{ Licenses Used in Qt}{other licenses used in Qt},
-    not provided under the \l{GNU General Public License (GPL)},
-    \l{GNU Lesser General Public License (LGPL)} or the \l{Qt Commercial License}.
+    The following table lists parts of Qt that incorporate code licensed under
+    licenses other than \l{GNU Lesser General Public License (LGPL)} or the
+    commercial license, as well as Qt modules that are only available under a
+    specific license or a version of a license.
+
     \l{Third-Party Licenses Used in Qt}{Third-party licenses} used in libraries that
     are supplied alongside Qt modules are also listed.
 
@@ -81,7 +90,7 @@
     \table 80%
     \header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes
 
-    \row \li {1,25} Qt Core
+    \row \li {1,26} Qt Core
 
     \row \li \l{QCrashHandler class}{QCrashHandler}
          \li Parts of implementation of QCrashHandler class. \li BSD-style \li
@@ -132,17 +141,15 @@
          \li implements the SHA-3 encryption algorithm. \li BSD \li
     \row \li \l{Data Compression Library (zlib) version 1.2.5}{zlib}
          \li zlib is a general purpose data compression library. \li BSD-style \li
-    \row \li \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,11} Qt Gui
+    \row \li {1,12} Qt Gui
     \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper}
          \li Internal class for key mapping. \li Custom, BSD-style \li \l {Qt for Linux/X11}
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{Other Licenses Used in Qt#FreeType}{FreeType}
          \li Parts of FreeType project used in font rendering. \li GPLv2, FreeType Project License \li
-
-    \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{HarfBuzz (harfbuzz)}{HarfBuzz} \li OpenType layout engine. \li BSD-style \li
     \row \li \l{FreeType 2 (freetype) version 2.3.12}{FreeType 2}
          \li Parts of FreeType project used in font rendering. \li GPLv2, FreeType Project License \li
@@ -154,43 +161,51 @@
          \li Allows users to transfer information between and within applications. \li BSD-style \li
     \row \li \l{ANGLE (angle)}{ANGLE}
          \li Opensource project to map OpenGL ES API calls to DirectX API. \li BSD-style \li \l {Qt for Windows}
-    \row \li \li \li \li \li
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,3} Qt Location
+    \row \li {1,4} Qt Location
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{Poly2Tri}
          \li Poly2Tri is a sweepline constrained Delaunay Polygon Triangulation Library. \li BSD-style \li
-    \row \li \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,3} Qt Network
+    \row \li {1,4} Qt Network
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{The Public Suffix List}
          \li A list of all known public Internet suffixes. \li Mozilla Public License \li
-    \row \li \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,3} Qt Multimedia
+    \row \li {1,4} Qt Multimedia
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{FFTReal version 2.11}{FFTReal}
          \li Fast Fourier transform of real-valued arrays. \li LGPL \li (Used in example code).
-    \row \li \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,2} Qt SVG
+    \row \li {1,4} Qt SVG
 
     \row \li \l{Qt SVG License Information}
          \li Parts of code for arc handling in Qt SVG module. \li BSD-style \li Depends on Qt Gui, Qt Widgets
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,3} Qt Quick
+    \row \li {1,4} Qt Quick
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{Easing Equations}
          \li Easing Equations is a collection of swappable functions that add flavor to motion. \li BSD-style \li Depends on Qt QML, Qt Gui, Qt Network
-    \row \li \li \li \li \li
+    \row \li \li \li \li
+
+    \row \li {1,4} Qt Quick Controls
+    \row \li \l {Native Style for Android} \li \li Apache License 2.0 \li \l {Qt for Android}
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,5} Qt Script
-         \li \li \li (Provided for Qt 4 compatibility) \li
+    \row \li {1,6} Qt Script
+         \li \li \li \li (Provided for Qt 4 compatibility)
 
     \row \li \l{V8 benchmark tests}
          \li V8 benchmark tests used in Qt Script. \li BSD-style \li
@@ -199,10 +214,10 @@
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{JavaScriptCore}
-         \li  \li BSD-style \li
-    \row \li \li \li \li \li
+         \li \li LGPL v2 \li
+    \row \li \li \li \li
 
-    \row \li {1,6} Qt Test
+    \row \li {1,8} Qt Test
 
     \row \li \l{Other Licenses Used in Qt#Testlib}{Testlib}
          \li Parts of implementation of Qt Test library. \li BSD, MIT \li
@@ -214,14 +229,31 @@
          \li \li BSD-style \li
     \row \li \l{Callgrind}
          \li A performance profiling tool. \li GPL v2 \li
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,2} Qt Print Support
-         \li \li \li Depends on Qt Gui and Qt Widgets \li
+    \row \li {1,4} Qt Print Support
+         \li \li \li \li Depends on Qt Gui and Qt Widgets
 
     \row \li \l{Notes about PDF Licensing}{PDF Licensing}
          \li Notes about PDF Licensing. \li \li
+    \row \li \li \li \li
+    \row \li \li \li \li
+
+    \row \li {1,4} Qt Wayland
 
-    \row \li {1,4} Qt WebKit
+    \row \li \l {Wayland Protocol} \li \li MIT \li
+    \row \li \li \li \li
+    \row \li \li \li \li
+
+    \row \li {1,4} Qt WebEngine
+
+    \row \li \l {Qt WebEngine Widgets#License Information}{License information}
+         \li \li LGPL v3 or\br LGPL v2.1 + 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
@@ -229,38 +261,48 @@
     \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 {1,2} Qt Designer
+    \row \li {1,4} Qt Designer
 
     \row \li \l{Qt Designer License Information}
          \li Implementation of the recursive shadow casting algorithm in Qt Designer. \li BSD (MIT) \li
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,3} Qt Creator
+    \row \li {1,4} Qt Creator
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{Botan version 1.8.8}{Botan}
          \li A C++ crypto library used in Qt Creator. \li BSD \li
-    \row \li \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,4} Qt Image Formats
+    \row \li {1,6} Qt Image Formats
 
     \row \li {4,1} \b{Third-party Licenses}
     \row \li \l{TIFF Software Distribution (libtiff) version 3.9.2}{TIFF}
          \li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files. \li BSD \li
     \row \li \l{MNG Library (libmng) version 1.0.10}{MNG}
          \li Support decoding and displaying of MNG format image files. \li BSD-style \li
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,2} Qt SQL
+    \row \li {1,4} Qt SQL
 
     \row \li \l{SQLite (sqlite) version 3.7.17.0}{SQLite}
          \li A C library that implements a self-contained, embeddable, zero-configuration SQL database engine. \li BSD-style \li
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,2} Qt XML Patterns
+    \row \li {1,4} Qt XML Patterns
 
     \row \li \l {Bison Parser 2.3a}{Bison Parser}
          \li Bison is a parser generator. \li GPL with exception \li Depends on Qt Network
+    \row \li \li \li \li
+    \row \li \li \li \li
 
-    \row \li {1,8} Plugins
+    \row \li {1,10} Plugins
 
     \row \li \l{JPEG Software (libjpeg) version 8c}{JPEG}
          \li C software to implement JPEG image compression and decompression. \li BSD-style \li
@@ -276,7 +318,8 @@
          \li A toolkit-neutral way of providing accessibility facilities in application. \li LGPL \li \l {Qt for Linux/X11}
     \row \li \l{Third-Party Licenses Used in Qt#xkbcommon}{xkbcommon}
          \li Keymap handling library for toolkits and window systems. \li BSD-style \li \l {Qt for Linux/X11}
-
+    \row \li \li \li \li
+    \row \li \li \li \li
 
     \row \li {1,3} Qt Tools
 
@@ -299,7 +342,6 @@
     \brief Information about other licenses used for Qt components and third-party code.
 
     Qt contains some code that is not provided under the
-    \l{GNU General Public License (GPL)},
     \l{GNU Lesser General Public License (LGPL)} or the
     \l{Qt Commercial License}, but rather under
     specific licenses from the original authors.
@@ -317,6 +359,28 @@
 
     \generatelist legalese
 
+    \section1 Native Style for Android
+
+    \legalese
+    Copyright (C) 2005 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    \endlegalese
+
+    \list
+        \li \c {src/3rdparty/android/extract.h}
+    \endlist
+
     \section1 QCrashHandler class
 
     Copyright (c) 1998 by Bjorn Reese <breese@imada.ou.dk>
diff --git a/doc/src/legal/opensourcelicense.qdoc b/doc/src/legal/opensourcelicense.qdoc
index 641269a70..8b81c77e8 100644
--- a/doc/src/legal/opensourcelicense.qdoc
+++ b/doc/src/legal/opensourcelicense.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -40,8 +40,8 @@
     of free in this context as in "free speech", not as in "no cost".
 
     Digia supports the free software concept by providing the Qt Open Source
-    Edition, which is licensed under the \l{GNU General Public License (GPL)}
-    (version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
+    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.
 
@@ -52,12 +52,12 @@
     successful software projects like KDE to thrive, with thousands of developers
     around the world using open source versions of Qt at no cost to themselves.
 
-    The Open Source Edition can be downloaded from the \l{Opensource Downloads} page.
+    The Open Source Edition can be downloaded from the \l{Downloads} page.
 
     More information on Free and Open Source software is available online.
 
     \list
-    \li GNU GPL, GNU LGPL: \l http://www.gnu.org/
+    \li GNU LGPL: \l http://www.gnu.org/
     \li Open Source licensing: \l http://www.opensource.org/
     \endlist
 
@@ -68,6 +68,6 @@
     in the \l{Qt Licensing Overview} on the Qt website.
 
     If you are in doubt what edition of Qt is right for your project,
-    please contact Digia at \l http://qt.digia.com/contact-us.
+    please contact us: \l {http://www.qt.io/contact-us/}.
 
 */
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 0b990082f..4dd63a0c2 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -186,9 +186,6 @@ sudo apt-get install libsdl1.2debian:i386
 The Qt 5 installers for different platforms are available from the \l Downloads
 page. Choose the one that is appropriate.
 
-\note Enterprise packages are available from the \l{Try Qt Enterprise}
-page.
-
 Once you have the installer, follow these steps:
 
 \list 1
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index d2c4500e0..d34e4aa53 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -57,10 +57,6 @@
     You can download the Qt 5 installers from the \l Downloads page.
     For more information, see \l{Getting Started with Qt}.
 
-    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
-    page. Qt for iOS is also available as part of the Qt Mobile Edition,
-    see \l{Qt Enterprise}{qt.digia.com} for details.
-
     Before installing Qt, you first need to install
     Xcode. You will find it in the Mac App Store \l{Xcode}{here}.
 
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 41589ab68..ba186b90e 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -44,9 +44,6 @@
     You can download the Qt 5 installers and sources from the \l Downloads page.
     For more information, visit the \l{Getting Started with Qt} page.
 
-    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
-    page.
-
     \section2 Requirements for Development Host
 
     The Qt installers for Linux assume that a C++ compiler, debugger,
@@ -82,7 +79,7 @@
 
     You can also build Qt 5 from the source package and configure it according
     to your target platform. The source packages are obtained from
-    \l{http://qt-project.org/downloads}.
+    \l{http://www.qt.io/download/}.
 
     Below, you will find more information about building Qt from source.
     \list
@@ -113,7 +110,7 @@
     \li \l{Qt X11 Extras} - provides additional APIs for X11
     \endlist
 
-    Qt's vibrant and active community site, \l{http://qt-project.org} houses
+    Qt's vibrant and active community site, \l{http://qt.io} houses
     a wiki, a forum, and additional learning guides and presentations.
 */
 
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index 3fc76d598..06c70c459 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -48,9 +48,6 @@
     You can download the Qt 5 installers and sources from the \l Downloads page.
     For more information, visit the \l{Getting Started with Qt} page.
 
-    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
-    page.
-
     \section2 Building Qt 5 from Source
 
     Below, you will find more information about building Qt from source.
@@ -158,7 +155,7 @@
     \li \l{Qt Reference Pages} - a listing of C++ and QML APIs
     \endlist
 
-    Qt's vibrant and active community site, \l{http://qt-project.org} houses
+    Qt's vibrant and active community site, \l{http://qt.io} houses
     a wiki, a forum, and additional learning guides and presentations.
 
 */
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index d03353cfd..0c7ce1bcb 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -50,14 +50,11 @@
     You can download the Qt 5 installers and sources from the \l Downloads page.
     For more information, visit the \l{Getting Started with Qt} page.
 
-    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
-    page.
-
     \section2 Building Qt 5 from Source
 
     You can also build Qt 5 from the source package and configure it according
     to your target platform. The source packages are obtained from
-    \l{http://qt-project.org/downloads}.
+    \l{http://www.qt.io/download/}.
 
     Below, you will find more information about building Qt from source.
     \list
@@ -88,7 +85,7 @@
     \li \l{ActiveX in Qt}
     \endlist
 
-    Qt's vibrant and active community site, \l{http://qt-project.org} houses
+    Qt's vibrant and active community site, \l{http://qt.io} houses
     a wiki, a forum, and additional learning guides and presentations.
 
     \section2 Visual Studio Add-in
diff --git a/doc/src/snippets/code/doc_src_lgpl3.qdoc b/doc/src/snippets/code/doc_src_lgpl3.qdoc
new file mode 100644
index 000000000..7d1291aaf
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_lgpl3.qdoc
@@ -0,0 +1,209 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "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 Digia Plc and its Subsidiary(-ies) 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."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [LGPL v3]
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+//! [LGPL v3]
+