Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

39 files changed, 230 insertions, 379 deletions

diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2
deleted file mode 100644
index 194c39cb..00000000
--- a/LICENSE.GPLv2
+++ /dev/null
@@ -1,292 +0,0 @@
-            GNU GENERAL PUBLIC LICENSE
-
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- Contact: http://www.qt-project.org/legal
-
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
- GNU General Public License version 2, which is displayed below.
-
--------------------------------------------------------------------------
-
-            GNU GENERAL PUBLIC LICENSE
-                Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Preamble
-
- The licenses for most software are designed to take away your freedom
-to share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free software
---to make sure the software is free for all its users. This General
-Public License applies to most of the Free Software Foundation's
-software and to any other program whose authors commit to using it.
-(Some other Free Software Foundation software is covered by the GNU
-Lesser General Public License instead.) You can apply it to your
-programs, too.
-
-When we speak of free software, we are referring to freedom, not price.
-Our General Public Licenses are designed to make sure that you have the
-freedom to distribute copies of free software (and charge for this
-service if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone
-to deny you these rights or to ask you to surrender the rights. These
-restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis
- or for a fee, you must give the recipients all the rights that you
-have. You must make sure that they, too, receive or can get the source
-code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-Finally, any free program is threatened constantly by software patents.
-We wish to avoid the danger that redistributors of a free program will
-individually obtain patent licenses, in effect making the program
-proprietary. To prevent this, we have made it clear that any patent
-must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a
-notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of running
-the Program is not restricted, and the output from the Program is
-covered only if its contents constitute a work based on the Program
-(independent of having been made by running the Program). Whether that
-is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the
-Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above, provided
-that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License. (Exception: if the Program itself is interactive but does
-    not normally print such an announcement, your work based on the
-    Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of a
-storage or distribution medium does not bring the other work under the
-scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software
-    interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your cost
-    of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code. (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to control
-compilation and installation of the executable. However, as a special
-exception, the source code distributed need not include anything that
-is normally distributed (in either source or binary form) with the
-major components (compiler, kernel, and so on) of the operating system
-on which the executable runs, unless that component itself accompanies
-the executable.
-
-If distribution of executable or object code is made by offering access
-to copy from a designated place, then offering equivalent access to
-copy the source code from the same place counts as distribution of the
-source code, even though third parties are not compelled to copy the
-source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and will
-automatically terminate your rights under this License. However,
-parties who have received copies, or rights, from you under this License
-will not have their licenses terminated so long as such parties remain
-in full compliance.
-
-5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further restrictions
-on the recipients' exercise of the rights granted herein. You are not
-responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent license
-would not permit royalty-free redistribution of the Program by all
-those who receive copies directly or indirectly through you, then the
-only way you could satisfy both it and this License would be to refrain
-entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License may
-add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among countries
-not thus excluded. In such case, this License incorporates the limitation
-as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a version
-number of this License, you may choose any version ever published by
-the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the
-author to ask for permission. For software which is copyrighted by
-the Free Software Foundation, write to the Free Software Foundation;
-we sometimes make exceptions for this. Our decision will be guided by
-the two goals of preserving the free status of all derivatives of our
-free software and of promoting the sharing and reuse of software
-generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
-MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE
-TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-END OF TERMS AND CONDITIONS
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 341aa9ee..d26836dc 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -1,6 +1,6 @@
             GNU LESSER GENERAL PUBLIC LICENSE
 
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
  Contact: http://www.qt-project.org/legal
 
  You may use, distribute and copy the Qt GUI Toolkit under the terms of
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index aed671a0..747fb695 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -1,6 +1,6 @@
             GNU LESSER GENERAL PUBLIC LICENSE
 
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
  Contact: http://www.qt-project.org/legal
 
  You may use, distribute and copy the Qt GUI Toolkit under the terms of
diff --git a/doc/config/images/qt-codesample.png b/doc/config/images/qt-codesample.png
index e798ae24..6b76c048 100644
--- a/doc/config/images/qt-codesample.png
+++ b/doc/config/images/qt-codesample.png
diff --git a/doc/snippets/qmlapp/usecases/styling.qml b/doc/snippets/qmlapp/usecases/styling.qml
index 45ce780a..848c8df8 100644
--- a/doc/snippets/qmlapp/usecases/styling.qml
+++ b/doc/snippets/qmlapp/usecases/styling.qml
@@ -60,6 +60,7 @@ ApplicationWindow {
                     GradientStop { position: 1 ; color: control.pressed ? "#000" : "#fff" }
                 }
             }
-    }
+       }
     //![0]
+    }
 }
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index d238accc..6bffee92 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -186,8 +186,8 @@
 
     The \c -platform option sets the host platform and the compiler for building
     the Qt sources. The list of supported platforms and compilers is found in
-    the \l{Supported Platforms} page while the full list is listed in
-    \e{qtbase/mkspecs}.
+    the \l{Community Supported Platforms}{supported platforms} page while the
+    full list is available in \e{qtbase/mkspecs} directory.
 
     For example, on Ubuntu Linux systems, Qt can be compiled by several
     compilers such as clang or g++:
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index 968e0f3b..ea25eefd 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -148,7 +148,7 @@ and processes. Additionally, QSystemSemaphore can be used to control
 access to resources shared by the system, as well as to communicate
 between processes.
 
-The \l{Qt D-Bus} module is a Unix-only library you can use to
+The \l{Qt D-Bus} module is a cross-platform library you can use to
 implement IPC using the D-Bus protocol. It extends Qt's
 \l{Signals & Slots}{signals and slots} mechanism to the IPC
 level, allowing a signal emitted by one process to be connected to
@@ -166,19 +166,20 @@ The \l{QLocalServer} class provides a local socket based server. This
 class makes it possible to accept incoming local socket connections.
 
 Related Topics:
+
 \list
 \li \l {Qt D-Bus} - module documentation
     \list
     \li \l {Using Qt D-Bus Adaptors}
-    \li \l {QLocalSocket}
     \li \l {Declaring Signals in D-Bus Adaptors}
     \li \l {Declaring Slots in D-Bus Adaptors}
     \li \l {The Qt D-Bus Type System}
-    \li \l {Qt D-Bus XML Compiler (qdbusxml2cpp)}
+    \li \l {Qt D-Bus XML compiler (qdbusxml2cpp)}
     \endlist
+\li \l {QLocalSocket}
+\li \l {QSharedMemory}
 \endlist
 
-
 \section1 Serial Port Communication
 
 The \l{Qt Serial Port} module provides a C++ API for communicating
diff --git a/doc/src/core.qdoc b/doc/src/core.qdoc
index c1fb708a..d712a0a2 100644
--- a/doc/src/core.qdoc
+++ b/doc/src/core.qdoc
@@ -70,7 +70,8 @@ objects. Some examples of containers are: dynamic arrays, queues, linked
 lists, and associative arrays. Qt provides a set of general purpose,
 template-based container classes for structuring data in memory.
 
-See the full list of \l {Container Classes} for more details.
+See the full list of \l [QtCore]{The Container Classes}{Container Classes} for
+more details.
 
 \section1 Internationalization
 
diff --git a/doc/src/development/debug.qdoc b/doc/src/development/debug.qdoc
index 59c81a82..5e097494 100644
--- a/doc/src/development/debug.qdoc
+++ b/doc/src/development/debug.qdoc
@@ -153,19 +153,8 @@
     QT_MESSAGE_PATTERN="[%{type}] %{appname} (%{file}:%{line}) - %{message}"
     \endcode
 
-    \table
-    \header \li Placeholder \li Description
-    \row \li \c %{appname} \li QCoreApplication::applicationName()
-    \row \li \c %{file} \li Path to source file
-    \row \li \c %{function} \li Function
-    \row \li \c %{line} \li Line in source file
-    \row \li \c %{message} \li The actual message
-    \row \li \c %{pid} \li QCoreApplication::applicationPid()
-    \row \li \c %{threadid} \li ID of current thread
-    \row \li \c %{type} \li "debug", "warning", "critical" or "fatal"
-    \endtable
-
-    You can also install your own message handler using qInstallMessageHandler().
+    The format is documented in qSetMessagePattern(). You can also install your
+    own message handler using qInstallMessageHandler().
 
     If the \c QT_FATAL_WARNINGS environment variable is set,
     qWarning() exits after printing the warning message. This makes
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 4b556d1a..66d9d5ee 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -129,6 +129,7 @@
         \li \l{JSON Save Game Example}
         \li \l{Qt WebChannel Examples}
         \li \l{Qt WebEngine Examples}
+        \li \l{Qt WebEngine Widgets Examples}
         \li \l{Qt WebSockets Examples}{WebSocket Examples}
         \li \l{Qt WebKit Examples}{WebKit Examples}
         \endlist
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 323e6f4d..cb76cbf5 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -62,7 +62,7 @@
 
 /*!
     \externalpage http://www.gnu.org/licenses/gpl.html
-    \title GNU General Public License
+    \title GNU General Public License (GPL)
 */
 
 /*!
@@ -227,3 +227,58 @@
     \externalpage https://codereview.qt-project.org/#/admin/projects/qt/qtftp
     \title Qt FTP
 */
+
+/*!
+    \externalpage http://doc.qt.io/QtDataVisualization
+    \title Qt Data Visualization
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtQuickEnterpriseControls
+    \title Qt Quick Enterprise Controls
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtVirtualKeyboard
+    \title Qt Virtual Keyboard
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtCharts
+    \title Qt Charts
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtQuickCompiler
+    \title Qt Quick Compiler
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtForDeviceCreation
+    \title Qt for Device Creation
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtQuick2DRenderer
+    \title Qt Quick 2D Renderer
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtPurchasing
+    \title Qt Purchasing
+*/
+
+/*!
+    \externalpage http://doc.qt.io/qt-5/qtwebview-index.html
+    \title Qt WebView
+*/
+
+/*!
+    \externalpage http://doc.qt.io/qt-5/qtcanvas3d-index.html
+    \title Qt Canvas 3D
+*/
+
+/*!
+    \externalpage http://doc.qt.io/QtSupportedPlatforms/index.html
+    \title Officially Supported Platforms
+*/
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 5054593b..960a1582 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -73,7 +73,8 @@
     \li \l{Windows CE - Introduction to using Qt}{WinCE}
     \endlist
 
-    For more information, visit the \l{Supported Platforms} page.
+    For more information, visit the \l{Community Supported Platforms}
+    {supported platforms} page.
 
     \section1 Explore Qt
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 42c6abc2..c7cc07df 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -41,7 +41,8 @@ For more information, visit the \l{Getting Started with Qt} 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}.
+collects the relevant information for the \l{Community Supported Platforms}
+{supported platforms}.
 
 \section1 General Installation Information
 
diff --git a/doc/src/howtos/plugins-howto.qdoc b/doc/src/howtos/plugins-howto.qdoc
index d49b898b..86834e5b 100644
--- a/doc/src/howtos/plugins-howto.qdoc
+++ b/doc/src/howtos/plugins-howto.qdoc
@@ -349,7 +349,7 @@
     \snippet plugins/doc_src_plugins-howto.pro 5
 
     qmake automatically adds the plugins to QTPLUGIN that are typically
-    needed by the Qt modules used (see \c QT), while more specialized
+    needed by the Qt modules used (see \l QT), while more specialized
     plugins need to be added manually.
     The default list of automatically added plugins can be overridden
     per type.
@@ -388,6 +388,8 @@
     \list 1
     \li Add \c{CONFIG += static} to your plugin's \c .pro file.
     \li Use the Q_IMPORT_PLUGIN() macro in your application.
+    \li Use the Q_INIT_RESOURCE() macro in your application if the plugin ships
+       qrc files.
     \li Link your application with your plugin library using \c LIBS
        in the \c .pro file.
     \endlist
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 792c1d49..05836855 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -94,7 +94,7 @@
                 \li \l{Getting Started with Qt}
                 \li \l{What's New in Qt 5}
                 \li \l{Qt Examples and Tutorials}{Examples and Tutorials}
-                \li \l{Supported Platforms}
+                \li \l{Community Supported Platforms}{Supported Platforms}
                 \li \l{Qt Licensing}
                 \endlist
                 \enddiv
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 6ab8185f..71a444d0 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -151,10 +151,9 @@
     and Qt Quick's Text item).
 
     Support for these writing systems is transparent to the
-    programmer and completely encapsulated in \l{rich text
-    processing}{Qt's text engine}. This means that you don't need to
-    have any knowledge about the writing system used in a particular
-    language, except for the following small points:
+    programmer and completely encapsulated in \l{Rich Text Processing}{Qt's text engine}.
+    This means that you don't need to have any knowledge about the writing
+    system used in a particular language, except for the following small points:
 
     \list
 
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index b86d8556..78f8142a 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -468,7 +468,7 @@
     and related or neighboring rights to the source code.
     http://creativecommons.org/publicdomain/zero/1.0/
 
-    \section1 SQLite (sqlite) version 3.7.17.0
+    \section1 SQLite (sqlite) version 3.8.5.0
 
     \e{SQLite is a small C library that implements a
     self-contained, embeddable, zero-configuration SQL database engine.}
diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc
index e2a90d0d..2ba8b184 100644
--- a/doc/src/legal/fdl.qdoc
+++ b/doc/src/legal/fdl.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 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.
@@ -35,7 +35,7 @@
     Alternatively, you may use the documentation in accordance with the terms
     contained in a written agreement between you and Digia.
 
-    The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
+    The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
     Contact: \l{http://www.qt-project.org/legal}
 
     Reference: \l{GNU Free Documentation License}
diff --git a/doc/src/legal/lgpl.qdoc b/doc/src/legal/lgpl.qdoc
index f3ec6b04..79047c53 100644
--- a/doc/src/legal/lgpl.qdoc
+++ b/doc/src/legal/lgpl.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 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.
@@ -32,7 +32,7 @@
     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) 2014 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
+    The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
     Contact: http://www.qt-project.org/legal
 
     References:
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index c4132c3b..b4f6a430 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 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.
@@ -53,7 +53,7 @@
     the following license.
 
     \legalese
-    Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).\br
+    Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).\br
     Contact: http://www.qt-project.org/legal
 
     You may use this file under the terms of the BSD license as follows:
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index de85d027..ac0f0510 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -320,7 +320,7 @@ the APK:
 
      \note You must consider enabling/disabling the SSL features based on the
      legal restrictions in the region where your application is available.
-     See the \l{SSL Configure Options}{SSL configure options} for details about
+     See the \l{OpenSSL Configure Options}{SSL configure options} for details about
      the configurable features.
 
  \li Run \c{make build_libs} to build the \c libcrypto and \c libssl shared
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index ba186b90..859e8668 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -791,7 +791,7 @@
     Linux/x86, Linux/ppc, Linux/amd64 and Linux/ia64 (including Altix(R)).
 
     For information about the specific compilers supported, visit the
-    \l{Supported Platforms} page.
+    \l{Community Supported Platforms#Reference Configurations}{supported platforms} page.
 
     \section2 Installation problems
 
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index b11104e3..c64d8b91 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -174,7 +174,8 @@
     Qt for OS X is tested and compatible with several versions of GCC (GNU
     Compiler Collection) and Clang (as available from Xcode). For a list of
     tested configurations, refer to the \e{Reference Configuration} section of
-    the \l{Supported Platforms} page.
+    the \l{Community Supported Platforms#Reference Configurations}{supported platforms}
+    page.
 
     \section2 OS X on PowerPC hardware
 
diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/platform-notes-android.qdoc
index 2a9a23d6..c6c6ce2b 100644
--- a/doc/src/platforms/platform-notes-android.qdoc
+++ b/doc/src/platforms/platform-notes-android.qdoc
@@ -164,7 +164,7 @@
     you can use \c QPixmap("assets:/images/logo.png").
 
     If using the assets mechanism is not required for your app, the recommended way of distributing
-    resources with your Qt app is to use \l{the Qt Resource System}, which is a cross-platform mechanism
+    resources with your Qt app is to use \l{The Qt Resource System}, which is a cross-platform mechanism
     for distributing resources with your app.
 
     \section1 Supported Architectures
diff --git a/doc/src/platforms/platform-notes-qtee.qdoc b/doc/src/platforms/platform-notes-qtee.qdoc
index 7d2d76df..a53a6412 100644
--- a/doc/src/platforms/platform-notes-qtee.qdoc
+++ b/doc/src/platforms/platform-notes-qtee.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 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,6 +33,6 @@
     supports Qt development on embedded Linux and embedded Android
     devices.
 
-    See \l http://qt.digia.com/Product/Qt-Enterprise-Embedded/ for
+    See \l http://qt.io/qt-for-device-creation/ for
     more information.
 */
diff --git a/doc/src/platforms/platform-notes-rtos.qdoc b/doc/src/platforms/platform-notes-rtos.qdoc
index ec339f87..5b273663 100644
--- a/doc/src/platforms/platform-notes-rtos.qdoc
+++ b/doc/src/platforms/platform-notes-rtos.qdoc
@@ -358,6 +358,6 @@
 
     \note \l {http://www.ghs.com/products/rtos/integrity.html}{INTEGRITY} is a community supported platform
 
-    \sa {http://blog.qt.digia.com/blog/2012/06/01/developing-with-qt-commercial-for-integrity-on-windows-a-step-by-step-guide-to-configure-and-compile-qt-commercial-on-integrity-2/}{Developing with Qt Commercial for INTEGRITY on Windows}
+    \sa {http://blog.qt.io/blog/2012/06/01/developing-with-qt-commercial-for-integrity-on-windows-a-step-by-step-guide-to-configure-and-compile-qt-commercial-on-integrity-2/}{Developing with Qt Commercial for INTEGRITY on Windows}
     \sa {http://qt.gitorious.org/qt/qt-integrity}{the git repository}
 */
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 4fa5644c..6d5f6535 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -26,26 +26,43 @@
 ****************************************************************************/
 
 /*!
+    \keyword Supported Platforms
     \page supported-platforms.html
-    \title Supported Platforms
+    \title Community Supported Platforms
     \brief The platforms supported by Qt.
 
-    Qt is a cross-platform application and UI framework. Using Qt,
-    you can write GUI applications once and deploy them
+    Qt is a commercial and open source licensed cross-platform application
+    and UI framework. It is developed by The Qt Company, a solely owned
+    entity of Digia Plc, together with the Qt Project Community under an
+    open source governance model.
+
+    Using Qt, you can write GUI applications once and deploy them
     across desktop, mobile and embedded operating systems without
-    rewriting the source code.In Qt 5 all platforms are created using
-    the new \l{Qt Platform Abstraction} (QPA), which makes it easier
-    than before to port Qt into a new operating system.
+    rewriting the source code.
 
     Qt is supported on a variety of 32-bit and 64-bit platforms,
     and can usually be built on each platform with GCC, a vendor-supplied
-    compiler, or a third party compiler. Open GL (ES) 2.0 or
-    DirectX 9 (with ANGLE) is required for Qt Quick 2. Widgets and
-    Qt Quick 1 can be used also without hardware acceleration.
+    compiler, or a third party compiler. Open GL (ES) 2.0,
+    DirectX 9 (with ANGLE), or an \l {Qt Quick 2D Renderer} {alternative
+    renderer} is required for \l [QtQuick] {Qt Quick} 2.
+    \l [QtWidgets] {Qt Widgets}{Widgets} can be used also without
+    hardware acceleration.
+
+    Not all platforms supported by the Community are supported by The
+    Qt Company, and vice versa.
+
+    \list
+        \li \l {Officially Supported Platforms} - Platforms supported
+        by The Qt Company.
+    \endlist
+
+    In Qt 5 all platforms are created using the
+    \l{Qt Platform Abstraction} (QPA), which makes it easier
+    than before to port Qt into a new operating system.
 
     \section1 Desktop Platforms
 
-    You can develop with Qt on the following desktop platforms:
+    You can develop with Qt for the following desktop platforms:
 
     \list
         \li \l{Qt for Windows}{Windows}
@@ -65,7 +82,7 @@
     \section1 Mobile Platforms
 
     You can develop with Qt for the following mobile platforms supported
-    by Digia:
+    by The Qt Company:
 
     \list
         \li \l{Qt for Android}{Android}
@@ -160,7 +177,7 @@
                                      \li Clang as provided by Apple
     \endtable
 
-    Digia, Qt partners, open source projects and community users
+    The Qt Company, Qt partners, open source projects and community users
     are able to provide assistance with various different supported
     platforms and configurations.
 
@@ -190,7 +207,7 @@
 
     Please note that Qt is offered on an "as is" basis without warranty
     of any kind and that our products are not error or bug free. To the maximum extent
-    permitted by applicable law, Digia on behalf of itself and its suppliers, disclaims all
+    permitted by applicable law, The Qt Company on behalf of itself and its suppliers, disclaims all
     warranties and conditions, either express or implied, including, but not limited to,
     implied warranties of merchantability, fitness for a particular purpose, title and
     non-infringement with regard to the Licensed Software.
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 7e9551da..e228b023 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -35,8 +35,9 @@
     Before you get started, ensure that your development environment fulfills
     the \l{Qt for Windows Requirements}{requirements}.
 
-    The \e{Reference Configuration} section of the \l{Supported Platforms} page
-    contains the list of Windows version and the compiler tested to work with
+    The \e{Reference Configuration} section of the
+    \l{Community Supported Platforms#Reference Configurations}{supported platforms}
+    page contains a list of Windows versions and compilers tested to work with
     Qt.
 
     \section1 Downloading and Installing Qt
@@ -123,10 +124,10 @@
            application folder or by adding the \e bin folder of the ICU
            installation to the \c PATH environment variable.
 
-        \li \l{ANGLE}: This library converts
-           OpenGL ES 2.0 API calls to DirectX 9, removing the need to install
-           graphics drivers on the target machines. Building
-           the library requires the installation of the \l{Direct X SDK}.
+        \li \l{ANGLE}: This library converts OpenGL ES 2.0 API calls to DirectX 11 or DirectX 9
+           calls (depending on availability), removing the need to install graphics drivers on
+           the target machines.
+           Building the library requires the installation of the \l{Direct X SDK}.
            More information is available at \l{http://code.google.com/p/angleproject/wiki/DevSetup}
 
            \note When building for 64-bit environments, de-activate the
@@ -170,8 +171,14 @@
     higher is required. The default driver from Windows is OpenGL 1.1. Qt
     includes a version of the \l{ANGLE} project which is included from the
     Windows Qt installers. ANGLE implements the
-    OpenGL ES 2.0 API on top of DirectX 9. ANGLE requires that the DirectX SDK
-    is installed when building Qt.
+    OpenGL ES 2.0 API on top of DirectX 11 or DirectX 9.
+    ANGLE requires that the DirectX SDK is installed when building Qt.
+
+    ANGLE chooses the render backend depending on availability. DirectX 11
+    is usually preferable. However, some graphics cards may not fully
+    support it. For these cases, the environment variable \c QT_ANGLE_PLATFORM
+    (introduced in Qt 5.4) can be used to control the render backend. Possible
+    values are \c d3d11, \c d3d9 and \c warp.
 
     To use a custom version of ANGLE, set the \c ANGLE_DIR environment variable
     to point to the ANGLE source tree before building Qt.
@@ -440,7 +447,9 @@
     to build Qt including Qt WebKit.
 
     For more information about the MinGW builds, visit the
-    \e{Reference Configuration} section of the \l{Supported Platforms} page.
+    \e{Reference Configuration} section of the
+    \l{Community Supported Platforms#Reference Configurations}{supported platforms}
+    page.
 
     \section1 Intel C++ Compiler (Windows, Altix)
 
diff --git a/doc/src/qmlapp/glossary.qdoc b/doc/src/qmlapp/glossary.qdoc
index 460493de..db82da19 100644
--- a/doc/src/qmlapp/glossary.qdoc
+++ b/doc/src/qmlapp/glossary.qdoc
@@ -56,12 +56,10 @@
 
             The QML language provides a number of built in
             (\l{qtqml-typesystem-basictypes.html}{basic types}), and the
-            Qt Quick module provides various \l{qtquick-qmltypereference.html}
-            {Qt Quick types} for building QML applications. Types can also be
-            provided by third-party developers through
-            (\l{qtqml-modules-topic.html}{modules}) or by the application
-            developer in the application itself through
-            \l{qtqml-documents-definetypes.html}{QML Documents}.
+            Qt Quick module provides various \l {Qt Quick QML Types}{Qt Quick types}
+            for building QML applications. Types can also be provided by
+            third-party developers through (\l{qtqml-modules-topic.html}{modules}) or by the application
+            developer in the application itself through \l{qtqml-documents-definetypes.html}{QML Documents}.
 
             See \l{qtqml-typesystem-topic.html}{The QML Type System}
             for more details.
diff --git a/doc/src/qmlapp/usecases/layouts.qdoc b/doc/src/qmlapp/usecases/layouts.qdoc
index cd51b86f..dd50f87f 100644
--- a/doc/src/qmlapp/usecases/layouts.qdoc
+++ b/doc/src/qmlapp/usecases/layouts.qdoc
@@ -69,7 +69,7 @@ For the common case of wanting to \e position a set of types in a regular patter
 types. Items placed in a positioner are automatically positioned in some way; for example, a \l Row positions items to be
 horizontally adjacent (forming a row).
 
-For full details see \l {Item Positioners} and the documentation for \l{qtquick-qmltypereference.html#positioning}{the positioner types}.
+For full details see \l {Item Positioners} and the documentation for \l{Qt Positioning QML Types}{the positioner types}.
 
 \snippet qmlapp/usecases/layouts.qml import
 \snippet qmlapp/usecases/layouts.qml positioners
diff --git a/doc/src/qmlapp/usecases/styling.qdoc b/doc/src/qmlapp/usecases/styling.qdoc
index 0438ccb0..b36896f3 100644
--- a/doc/src/qmlapp/usecases/styling.qdoc
+++ b/doc/src/qmlapp/usecases/styling.qdoc
@@ -35,7 +35,7 @@ Qt Quick's \l{Models and Views in Qt Quick}{delegates} the visual type attaches
 to the \e delegate property.
 
 When using \l{Qt Quick Controls}, the controls automatically set
-the appropriate style from the respective \l{Supported Platforms}{platforms}.
+the appropriate style from the respective \l{Community Supported Platforms}{platforms}.
 
 \section1 Using the Styling QML Types
 
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index ceb6d399..de8d9009 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.qdoc
@@ -283,7 +283,7 @@
     module interact with the Qt Cloud servers from Digia.
 
     \list
-    \li \l{Enginio Data Storage}{Qt Cloud Services} by Digia
+    \li \l{Qt Cloud Services} by Digia
     \li \l{Enginio Manual}{Enginio} - API for developers
     \endlist
 
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 316e98b7..aa4701e0 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -163,7 +163,7 @@
             threading primitives.
     \row
         \li \l[QtDBus]{Qt D-Bus}
-        \li Unix-based
+        \li All
         \li
         \li Classes for inter-process communication over the D-Bus protocol.
     \row
@@ -255,7 +255,12 @@
         \li \l[QtWebEngine]{Qt WebEngine}
         \li All
         \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
-        \li Provides support for web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
+        \li Provides a QML API to run web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
+    \row
+        \li \l[QtWebEngineWidgets]{Qt WebEngine Widgets}
+        \li All
+        \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
+        \li Provides a C++ API to run web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
     \row
         \li \l[QtWebSockets]{Qt WebSockets}
         \li All
@@ -285,6 +290,56 @@
         \li Support for XPath, XQuery, XSLT and XML schema validation.
     \endtable
 
+    \section1 Value-Add Modules
+
+    In addition to the modules released as part of Qt 5, the following modules
+    and tooling build on top of the Qt libraries to provide additional value. They
+    have their own release schedule, and are available under different Qt licenses.
+    See the \l {Downloads} page for more information.
+
+    \table 80%
+    \header
+        \li Feature
+        \li Description
+
+    \row \li \l{Qt for Device Creation}
+         \li Tools for fast, easy, and fully-integrated embedded device application development.
+             Includes most other Value-Add features.
+    \row \li \l{Qt Charts}
+         \li UI Components for displaying visually pleasing charts, driven by static or dynamic
+             data models.
+    \row \li \l{Qt Quick Compiler}
+         \li Enables compiling .qml source files into application binaries, improving load times
+             and security for code assets.
+    \row \li \l{Qt Quick Enterprise Controls}
+         \li A set of advanced UI controls with an industry-specific look-and-feel.
+    \row \li \l{Qt Data Visualization}
+         \li UI Components for creating stunning 3D data visualizations.
+    \row \li \l{Qt Purchasing}
+         \li Enables in-app purchase of products in Qt applications on mobile platforms.
+    \row \li \l{Qt Virtual Keyboard}
+         \li A framework for implementing different input methods as well as a QML virtual keyboard.
+             Supports localized keyboard layouts and custom visual themes.
+    \row \li \l{Qt Quick 2D Renderer}
+         \li Enables the use of Qt Quick UI on devices without OpenGL capability.
+    \endtable
+
+    \section1 Technology Preview Modules
+
+    The following modules are still in development but are available as technology previews.
+
+    \table 80%
+    \header
+        \li Module
+        \li Description
+
+    \row \li \l{Qt WebView}
+         \li Displays web content in a QML application by using APIs native to the platform,
+             without the need to include a full web browser stack.
+    \row \li \l{Qt Canvas 3D}
+         \li Enables OpenGL-like 3D drawing calls from Qt Quick applications using JavaScript.
+    \endtable
+
     \section1 Qt Tools
 
     \e{Qt Tools} run on all the supported development platforms and facilitate
diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc
index f96dfbde..9671a86b 100644
--- a/doc/src/reference.qdoc
+++ b/doc/src/reference.qdoc
@@ -52,6 +52,19 @@
     \li \l{qmake Manual}{qmake}
     \endlist
 
+    \section2 Value-Add Features
+
+    \list
+    \li \l{Qt for Device Creation}
+    \li \l{Qt Charts}
+    \li \l{Qt Quick Compiler}
+    \li \l{Qt Quick Enterprise Controls}
+    \li \l{Qt Data Visualization}
+    \li \l{Qt Purchasing}
+    \li \l{Qt Virtual Keyboard}
+    \li \l{Qt Quick 2D Renderer}
+    \endlist
+
     \section2 Platform Reference
 
     \annotatedlist supportedplatform
diff --git a/doc/src/scripting.qdoc b/doc/src/scripting.qdoc
index c6f5a915..26e1fb60 100644
--- a/doc/src/scripting.qdoc
+++ b/doc/src/scripting.qdoc
@@ -53,5 +53,5 @@ This is a simple API, very similar to \l{Qt Script}, but limited to basic functi
  (\l{Use Case - Integrating JavaScript in QML}).
 
 All of these three scripting solutions seamlessly inter-operate with \l{The Meta-Object System}{the Meta-Object System}, which means that all \l{Signals & Slots}{signals and slots} and
-\l{The property system}{properties} of a QObject instance are accessible in an \l{ECMAScript Reference}{ECMAScript} environment.
+\l{The Property System}{properties} of a QObject instance are accessible in an \l{ECMAScript Reference}{ECMAScript} environment.
 */
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc
index c366cfc5..c4ec24ce 100644
--- a/doc/src/source-breaks.qdoc
+++ b/doc/src/source-breaks.qdoc
@@ -559,7 +559,7 @@ recommendations for handling those changes.
         \l{http://qt.gitorious.org/qt/qtstyleplugins}{qtstyleplugins} project
         to get these styles or update your application to use the new fusion style.
         For more details about this change, see
-        \l{https://blog.qt.digia.com/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/}.
+        \l{https://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/}.
     \li The following QStyle implementations have been made internal:
         \list
             \li QFusionStyle
@@ -721,7 +721,7 @@ recommendations for handling those changes.
       \li \c{QTest::qt_snprintf()} is removed. This was an
           internal test library function that was exposed in the public API due to its use
           in a public macro. Any calls to this function must be replaced with
-          \l{QByteArray::qsnprintf()}.
+          \l{bytearray-qsnprintf}{QByteArray::qsnprintf()}.
       \li c{QTest::pixmapsAreEqual()} is removed. Comparison of \l{QPixmap} objects must
           be done using the \c{QCOMPARE} macro, which provides more informative output in the event of a failure.
       \li The \c{"mode"} parameter in \c{QSKIP} macro is removed. This parameter caused problems
@@ -791,7 +791,7 @@ recommendations for handling those changes.
      \li Configure no longer calls \c{qmake -recursive} by default, because the
          subsequent build invokes qmake as needed. Use \c{-fully-process} to
          restore the old behavior.
-     \li The \l lupdate \c CODECFORTR variable is deprecated, because source
+     \li The \l {Using lupdate}{lupdate} \c CODECFORTR variable is deprecated, because source
          code written with Qt 5 is expected to use UTF-8 encoding.
     \endlist
 
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index b90a6284..949ef3e2 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -33,9 +33,9 @@
 Qt features multiple technologies for creating user interfaces. While it is
 possible to mix and match these different technologies as needed, one approach
 is often better suitable for a certain type of user interface than the others.
-\l {Qt Creator} is a good example of an application that mixes different user
+\l {Qt Creator Manual}{Qt Creator} is a good example of an application that mixes different user
 interface technologies. In fact, it uses all of the three different approaches
-described below. \l {Qt Creator} uses the traditional \l {Qt Widgets} such as
+described below. Qt Creator uses the traditional \l {Qt Widgets} such as
 menus and dialogs as a basis of the user interface, \l {Qt Quick} amongst others
 for the welcome screen, and \l {Qt WebKit} for presenting the Qt reference
 documentation. The following sections provide brief introductions to the
diff --git a/doc/src/whatsnew/whatsnew50.qdoc b/doc/src/whatsnew/whatsnew50.qdoc
index 848bda3b..df0664d6 100644
--- a/doc/src/whatsnew/whatsnew50.qdoc
+++ b/doc/src/whatsnew/whatsnew50.qdoc
@@ -140,7 +140,6 @@
     \list
      \li New \l{var} property type can hold JavaScript references.
      \li QML properties of type \l{var} and \l{variant} can now hold pixmaps.
-         See \l{Scarce Resources in JavaScript} for more information.
      \li Value type improvements:
       \list
        \li QColor is now a value type. The red, green, blue and alpha channels
diff --git a/doc/src/whatsnew/whatsnew51.qdoc b/doc/src/whatsnew/whatsnew51.qdoc
index 83b70a0f..cc569ff7 100644
--- a/doc/src/whatsnew/whatsnew51.qdoc
+++ b/doc/src/whatsnew/whatsnew51.qdoc
@@ -141,7 +141,7 @@
         \li New Instantiatior type for generic, dynamic object creation.
         \li New \l{QtQml.Models} module containing \l ListElement, \l ListModel,
             \l DelegateModel, \l DelegateModelGroup, and \l ObjectModel.
-        \li New properties for \l Qt.application: arguments, name, and version.
+        \li New properties for \l [QML]{Qt::application}: arguments, name, and version.
         \endlist
 
     \section2 Qt Quick Changes