diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index d1c770dc802bee80524b8dcffbb5c4dba6380213..2a3372514da6e043d4d746c6d6690067066ab981 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -38,7 +38,7 @@ depends += \
qtqml \
qtqmltest \
qtquick \
- qtquickcontrols \
+ qtquickcontrols1 \
qtquickdialogs \
qtquickextras \
qtscript \
@@ -62,7 +62,7 @@ depends += \
qt3d \
qtcanvas3d \
qtwebview \
- qtquickcontrols2 \
+ qtquickcontrols \
qtwaylandcompositor \
qtcharts \
qtdatavisualization \
diff --git a/doc/snippets/qmlapp/usecases/animations.qml b/doc/snippets/qmlapp/usecases/animations.qml
index beb01c47355c7743df40c6c8e961cab67ae5edfe..a7d5e3048b444428707844ae465cf180ea46d836 100644
--- a/doc/snippets/qmlapp/usecases/animations.qml
+++ b/doc/snippets/qmlapp/usecases/animations.qml
@@ -49,7 +49,7 @@
****************************************************************************/
//![0]
-import QtQuick 2.3
+import QtQuick 2.12
Item {
@@ -76,9 +76,8 @@ Item {
width: 120
height: 120
- MouseArea {
- anchors.fill: parent
- onClicked: container.state == 'other' ? container.state = '' : container.state = 'other'
+ TapHandler {
+ onTapped: container.state === '' ? container.state = 'other' : container.state = ''
}
}
states: [
@@ -124,9 +123,8 @@ Item {
}
}
- MouseArea {
- anchors.fill: parent
- onClicked: parent.x == 0 ? parent.x = 200 : parent.x = 0
+ TapHandler {
+ onTapped: parent.x == 0 ? parent.x = 200 : parent.x = 0
}
}
}
@@ -153,10 +151,9 @@ Item {
PauseAnimation { duration: 250 } // This puts a bit of time between the loop
}
- MouseArea {
- anchors.fill: parent
+ TapHandler {
// The animation starts running when you click within the rectangle
- onClicked: xAnim.running = true
+ onTapped: xAnim.running = true
}
}
}
@@ -173,10 +170,9 @@ Item {
width: 120
height: 120
- MouseArea {
- anchors.fill: parent
+ TapHandler {
// The animation starts running when you click within the rectange
- onClicked: anim.running = true;
+ onTapped: anim.running = true;
}
}
diff --git a/doc/snippets/qmlapp/usecases/integratingjs-inline.qml b/doc/snippets/qmlapp/usecases/integratingjs-inline.qml
index 70d1afe9eac40dbfb4221a129bb0679e3782f5e3..8e98b461efc1fe966f67080f270a12bf7659c310 100644
--- a/doc/snippets/qmlapp/usecases/integratingjs-inline.qml
+++ b/doc/snippets/qmlapp/usecases/integratingjs-inline.qml
@@ -49,7 +49,7 @@
****************************************************************************/
//![0]
-import QtQuick 2.3
+import QtQuick 2.12
Item {
id: container
@@ -64,10 +64,9 @@ Item {
return container.randomNumber();
}
- MouseArea {
- anchors.fill: parent
+ TapHandler {
// This line uses the JS function from the item
- onClicked: rectangle.rotation = container.getNumber();
+ onTapped: rectangle.rotation = container.getNumber();
}
Rectangle {
diff --git a/doc/snippets/qmlapp/usecases/integratingjs.qml b/doc/snippets/qmlapp/usecases/integratingjs.qml
index eb26f4614f73c968117ab1b0a670963157bde1c6..9a9d860273aa365eb2493a5e275e6ddaaa754919 100644
--- a/doc/snippets/qmlapp/usecases/integratingjs.qml
+++ b/doc/snippets/qmlapp/usecases/integratingjs.qml
@@ -49,7 +49,7 @@
****************************************************************************/
//![0]
-import QtQuick 2.3
+import QtQuick 2.12
import "myscript.js" as Logic
Item {
@@ -62,10 +62,9 @@ Item {
height: 480
}
- MouseArea {
- anchors.fill: parent
+ TapHandler {
// This line uses the JS function from the separate JS file
- onClicked: rectangle.rotation = Logic.getRandom(rectangle.rotation);
+ onTapped: rectangle.rotation = Logic.getRandom(rectangle.rotation);
}
Rectangle {
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 54ef66be390b7a44459ddf51e22694d958da80e0..31ef82569852fd3fac8e1bf21eedf81b0edf9e6f 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -88,7 +88,7 @@
\list
\li \l{First Steps with QML}
\li \l{Qt Creator: Developing Qt Quick Applications}{Developing Qt Quick Applications}
- \li \l{Qt Quick Controls - Gallery}
+ \li \l{Qt Quick Controls 1 - Gallery}
\li \l{Qt Quick Controls 2 - Gallery}
\li \l{QML Advanced Tutorial}{SameGame}
\li \l{Qt Quick Text Editor Guide}
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 4d202ddb4beb39f7fbf405356007120152001caf..384fbf9db37514ae9bbb29cb3b8b33d486358ca6 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -61,8 +61,8 @@
*/
/*!
- \externalpage http://opensource.org/licenses/bsd-license.php
- \title New and Modified BSD Licenses
+ \externalpage https://spdx.org/licenses/BSD-3-Clause.html
+ \title BSD 3-Clause "New" or "Revised" License
*/
/*!
@@ -303,6 +303,10 @@
\externalpage https://doc.qt.io/QtForDeviceCreation/qt-configuration-tool.html
\title Qt Configuration Tool
*/
+/*!
+ \externalpage https://doc.qt.io/QtForDeviceCreation/qtdc-supported-platforms.html
+ \title Qt for Device Creation: Supported Target Devices and Development Hosts
+*/
/*!
\externalpage https://qmlbook.github.io/
diff --git a/doc/src/getting-started/controls-texteditor.qdoc b/doc/src/getting-started/controls-texteditor.qdoc
index da693108934d7365df39799679d852c91cfef25e..87a36288b2f9147dffd804df0d49f754b166c3e9 100644
--- a/doc/src/getting-started/controls-texteditor.qdoc
+++ b/doc/src/getting-started/controls-texteditor.qdoc
@@ -59,7 +59,7 @@ the application.
The files are part of the Qt package and are available when searched for
\uicontrol{Qt Quick Text Editor} in Qt Creator's \uicontrol{Welcome mode}.
All files used in the application are listed for viewing in the
-\l{Qt Quick Controls - Text Editor Example} page.
+\l{Qt Quick Controls 1 - Text Editor Example} page.
\section1 Setting Up the Environment and Project
@@ -105,7 +105,7 @@ later in the guide:
The text editor uses several icons to represent various actions. The icons are
in the \e images directory which is directly under the \e TextEditor project
directory. The images as well as the project files are also listed in the
-reference documentation on the \l{Qt Quick Controls - Text Editor Example} page.
+reference documentation on the \l{Qt Quick Controls 1 - Text Editor Example} page.
We first need to register the image files into the project's resource file,
\e qml.qrc. The resource files compact the images into the binary packages.
@@ -134,7 +134,7 @@ binary. For more information about resource files, see the
The accompanying examples files are listed in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
@@ -331,7 +331,7 @@ QML type and \l{Signal and Handler Event System}.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
@@ -521,7 +521,7 @@ these C++ functions in QML files.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
@@ -679,7 +679,7 @@ and QML file are already packaged into the binary file.
The accompanying examples files are found in the following page:
\list
-\li \l{Qt Quick Controls - Text Editor Example}
+\li \l{Qt Quick Controls 1 - Text Editor Example}
\endlist
*/
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 115293532a20bb94b0092fe1fc874ca23274c4d6..fcd2487adcb18482a0e786190935f5caaef58ec0 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -52,6 +52,14 @@
to load your application into Visual C++; here we are only using
the icon editor.)
+ Alternatively, an \c .ico file can be created from a set of images using
+ ImageMagick's \l {https://imagemagick.org/script/convert.php}{convert}
+ tool:
+
+ \badcode
+ magick.exe convert icon-16.png icon-32.png icon-256.png icon.ico
+ \endcode
+
Store the ICO file in your application's source code directory,
for example, with the name \c myappico.ico.
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc
index e1a4bbcf6534356facc26efe04b2a3d8131a2b23..b6bc5212581612b4dced70b8daa45522f82740f7 100644
--- a/doc/src/howtos/scalabilityintro.qdoc
+++ b/doc/src/howtos/scalabilityintro.qdoc
@@ -117,9 +117,9 @@
In addition to controls that define standard parts of application windows,
controls are provided for creating views and menus, as well as presenting or
- receiving input from users. You can use \l{Qt Quick Controls Styles} to
+ receiving input from users. You can use \l{Qt Quick Controls 1 Styles} to
apply custom styling to the predefined controls. For examples of using the
- styles, see \l{Qt Quick Controls - Touch Gallery}.
+ styles, see \l{Qt Quick Controls 1 - Touch Gallery}.
Qt Quick Controls, such as the ToolBar, do not provide a layout
of their own, but require you to position their contents. For this, you can
diff --git a/doc/src/legal/bsd.qdoc b/doc/src/legal/bsd.qdoc
new file mode 100644
index 0000000000000000000000000000000000000000..8ec7c94d9abbb80dde313d757f3bdd207e92b3bb
--- /dev/null
+++ b/doc/src/legal/bsd.qdoc
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \page examples-license.html
+ \title License of Qt examples
+
+ Qt examples are available under commercial licenses from The Qt Company.
+ In addition, they are available under the terms of a
+ \l{BSD 3-Clause "New" or "Revised" License}:
+
+ \snippet snippets/code/doc_src_bsd.qdoc BSD-3-clause
+*/
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index add022a43e271c73debe9aeedf10ca8f31ad8f65..00ff4588b67839f706538a3b46fefbe400ae9e17 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -60,6 +60,9 @@
Foundation. Alternatively, you may use the documentation in accordance with
the terms contained in a written agreement between you and The Qt Company.
+ \e {Qt examples} are available under commercial licenses from The Qt Company,
+ and under a \l{License of Qt examples}{BSD-3-clause} license.
+
See \l{http://qt.io/licensing/} for an overview of Qt licensing.
\section1 Purchasing and Sales Information
diff --git a/doc/src/legal/opensourcelicense.qdoc b/doc/src/legal/opensourcelicense.qdoc
index e847d7802f0db50e0e3166efd097540f73e0fda5..c82b5c517d0cceae82fe14620429fc502e8c49ab 100644
--- a/doc/src/legal/opensourcelicense.qdoc
+++ b/doc/src/legal/opensourcelicense.qdoc
@@ -44,8 +44,9 @@
version 3. You can use this edition of Qt to create and distribute software with licenses
that are compatible with this free software license.
- Additionally, the \l{Qt Examples and Tutorials}{examples} included with Qt are provided under
- the terms of the \l{New and Modified BSD Licenses}{Modified BSD License}.
+ Additionally, the \l{Qt Examples and Tutorials}{examples} included with Qt are provided
+ under the terms of the \l{BSD 3-Clause "New" or "Revised" License}. See also
+ \l{License of Qt examples}.
The support of open source with the Open Source Versions of Qt has enabled large
successful software projects like KDE to thrive, with thousands of developers
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index eec4938bbf6066f5e307a2d6cad00563451a3d64..706eccd0b23599885d54322df3efba30c4063c68 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -1086,15 +1086,13 @@
Refer to the \l{https://wiki.qt.io/WestonTouchScreenIssues}{Qt Wiki} for
further information.
- //! Qt Quick WebGL QPA Plugin
- \include webgl.qdocinc webgl
-
\section1 Related Topics
\list
\li \l{Qt for Device Creation}
\li \l Emulator
\li \l{Qt Virtual Keyboard}
+ \li \l{Qt Quick WebGL}
\endlist
*/
diff --git a/doc/src/platforms/qnx.qdoc b/doc/src/platforms/qnx.qdoc
index 026540f9b37b00365edec589084efc4383785782..b307ded936eb099b728e437faf8c02fddcf2bcff 100644
--- a/doc/src/platforms/qnx.qdoc
+++ b/doc/src/platforms/qnx.qdoc
@@ -85,7 +85,7 @@
previous configuration, this choice does not not use
\l{http://www.qnx.com/download/group.html?programid=26072}{QNX SDK for Apps and Media 1.0} which provides
\c{fontconfig} and multimedia support along with other features. In this case, Qt will use the
- internal font database instead of \c{fontconfig}, and \l{Multimedia}{multimeida} will be not functional.
+ internal font database instead of \c{fontconfig}, and \l{Multimedia}{multimedia} will be not functional.
\endlist
The compiler and other parts of the tool chain are provided in the SDP packages. You do not need
diff --git a/doc/src/platforms/webgl.qdocinc b/doc/src/platforms/webgl.qdoc
similarity index 81%
rename from doc/src/platforms/webgl.qdocinc
rename to doc/src/platforms/webgl.qdoc
index fbff33e18cc51385bbc7253f7239583363ce3c66..07f0d791072512bc251a82912d2085844612b2f1 100644
--- a/doc/src/platforms/webgl.qdocinc
+++ b/doc/src/platforms/webgl.qdoc
@@ -25,16 +25,16 @@
**
****************************************************************************/
/*!
-//! [webgl]
+\page webgl.html
+\title Qt Quick WebGL
+\brief A platform plugin that enables streaming or Qt Quick user interfaces
+ using WebGLâ„¢.
+\ingroup supportedplatform
-\section1 Qt Quick WebGL
-
-The \e {Qt Quick WebGL} platform plugin allows for remote access by streaming
-Qt Quick user interfaces over the network. The UI is rendered in a
-WebGLâ„¢-enabled client browser.
-
-\note The Qt Quick WebGL plugin is currently provided as a
- \e {Technology Preview}.
+The \e {Qt Quick WebGL} is a \l {Qt Platform Abstraction} {platform plugin}
+that allows for single-user remote access by streaming \l [QtQuick] {Qt Quick}
+user interfaces over the network. The UI is rendered in a
+\l {https://www.khronos.org/webgl/}{WebGLâ„¢}-enabled client browser.
\section2 Configuration and Use
@@ -45,9 +45,9 @@ OpenGL ES 2 support:
./configure [...] -opengl es2
\endcode
-The plugin depends on \l {Qt WebSockets}.
+The plugin has a dependency to \l {Qt WebSockets}.
-You launch a Qt Quick application with the \e webgl platform plugin as
+Any Qt Quick application can be launched with the \e webgl platform plugin as
follows:
\badcode
@@ -62,7 +62,8 @@ port can be configured as follows:
./qmlapplication -platform webgl:port=80
\endcode
-Keyboard, mouse, touch, and multi-touch events from the client are supported.
+Keyboard, mouse, touch, and multi-touch events from the client are passed to
+the application.
\section2 Limitations
@@ -92,6 +93,4 @@ Keyboard, mouse, touch, and multi-touch events from the client are supported.
\badcode
set QSG_RENDER_LOOP=threaded
\endcode
-
-//! [webgl]
*/
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index 0e6af3e470f38aa4b199f79996b520ccda800497..d3602849231d59192105678f07af4cf40bce240c 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -98,8 +98,8 @@ several controls such as buttons, menus, and views. These controls mimic the
native behavior found in different platforms such as Windows, \macos, and Linux.
\list
-\li \l{Qt Quick Controls Overview}
-\li \l{Qt Quick Controls Styles}{Styles}
+\li \l{Qt Quick Controls 1 Overview}
+\li \l{Qt Quick Controls 1 Styles}{Styles}
\li \l{Qt Quick Dialogs}{Dialogs}
\li \l{Qt Quick Layouts}{Layouts}
\li \l{Qt Quick Extras}{Extras}
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index 2ad97fec67ccf192c8fbaafa0aed6354e86347a1..a563beade90957ea9161d645858ca6538bfc6916 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -179,7 +179,7 @@ Qt Creator and demonstrate different controls and layouts.
\list
\li \l{Qt Quick Layouts - Basic Example}{Basic Layouts}
-\li \l{Qt Quick Controls - Touch Gallery}{Touch Gallery}
+\li \l{Qt Quick Controls 1 - Touch Gallery}{Touch Gallery}
\endlist
Feel free to copy and paste the snippets onto this simple Hellow World
diff --git a/doc/src/qmlapp/usecases/styling.qdoc b/doc/src/qmlapp/usecases/styling.qdoc
index 74b51d61229d4a91d115f22f8c6b82a3c5ce83dc..92f80b50a4d85b3e61efcfdbe0ad5c76aa5eabc5 100644
--- a/doc/src/qmlapp/usecases/styling.qdoc
+++ b/doc/src/qmlapp/usecases/styling.qdoc
@@ -27,29 +27,30 @@
/*!
\page qtquick-usecase-styling.html
\title Use Case - Style And Theme Support
-\brief Example of how to style user interface components in QML
+\brief Example of how to style user interface components in QML.
Styling with QML involves creating a visual type and binding that to a property
or by directly assigning a value to a property. For types that incorporate
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
+When using \l{Qt Quick Controls 1}, the controls automatically set
the appropriate style from the respective \l{Supported Platforms}{platforms}.
\section1 Using the Styling QML Types
-The \l{Qt Quick Controls}{controls} have a \c style property to which the
+The \l{Qt Quick Controls 1}{controls} have a \c style property to which the
\e{styling types} bind. The controls have a corresponding styling type from the
-\l{Qt Quick Controls Styles QML Types}{Qt Quick Controls Styles} module.
-For example, \l Button has a \l ButtonStyle type and \l Menu has a
-\l MenuStyle type. The styling types provide properties applicable to their
-respective controls such as the background, label, or for some controls, the
-cursor appearance.
+\l{Qt Quick Controls 1 Styles QML Types}{Qt Quick Controls 1 Styles} module.
+For example, \l [QtQuickControls1] Button has a
+\l [QtQuickControls1] ButtonStyle type and \l [QtQuickControls1] Menu has a
+\l [QtQuickControls1] MenuStyle type. The styling types provide properties
+applicable to their respective controls such as the background, label, or for
+some controls, the cursor appearance.
\snippet qmlapp/usecases/styling.qml 0
-\note \l{Qt Quick Controls Styles QML Types}{Qt Quick Controls Styles} was
+\note \l{Qt Quick Controls 1 Styles QML Types}{Qt Quick Controls 1 Styles} was
introduced in Qt 5.1 and requires \l{Qt Quick} 2.1.
\section1 Accessing the System Palette
@@ -60,5 +61,6 @@ of visual types to match the native look-and-feel. In addition, on
\l{Desktop Platforms}{desktop} platforms, different color palettes are employed
when changing states, for example, when the application loses keyboard focus.
-When using the \l{Qt Quick Controls}{controls}, the system colors are already used.
+When using the \l{Qt Quick Controls 1}{controls}, the system colors are already
+used.
*/
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 6c521d3beff707e378fcf3a023d4d0610dda608b..42f2989f7ecdee5ce5e1382c9687ba0ebc9913db 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -260,6 +260,13 @@
\li
\li Provides a specialized set of controls that can be used to build
interfaces in Qt Quick.
+ \row
+ \li \l {Qt Quick WebGL}
+ \li All
+ \li WebGL-enabled web browsers
+ \li Provides a \l {Qt Platform Abstraction} {platform plugin} that
+ allows streaming Qt Quick user interfaces over the network using
+ WebGLâ„¢.
\row
\li \l{Qt Quick Widgets C++ Classes}{Qt Quick Widgets}
\li All
diff --git a/doc/src/snippets/code/doc_src_bsd.qdoc b/doc/src/snippets/code/doc_src_bsd.qdoc
new file mode 100644
index 0000000000000000000000000000000000000000..cfb0e036c58739058ef331121a2d09cc4620a773
--- /dev/null
+++ b/doc/src/snippets/code/doc_src_bsd.qdoc
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [BSD-3-clause]
+Copyright (C) 2018 The Qt Company Ltd.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ * Neither the name of The Qt Company Ltd 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.
+//! [BSD-3-clause]
diff --git a/doc/src/userinterfaces.qdoc b/doc/src/userinterfaces.qdoc
index 3148e099788032a53683e63cff8c9f876e2852d7..3018b1d36bb4cb867cbda9643b4f3737d6ba99a7 100644
--- a/doc/src/userinterfaces.qdoc
+++ b/doc/src/userinterfaces.qdoc
@@ -151,7 +151,7 @@ choose the tool best suited for the job.
\li \inlineimage ok
\li \inlineimage ok
\li
- \li Qt Widgets and Qt Quick Controls integrate well to the underlying
+ \li Qt Widgets and Qt Quick Controls 1 integrate well to the underlying
platform, providing a native look'n'feel on Windows, Linux, and \macos.
\row
\li Custom look'n'feel
diff --git a/doc/src/web-content.qdoc b/doc/src/web-content.qdoc
index 37060348a6ede47c00c258ecf8fbccaf8bef2c86..3a593654a4439eabddb54cba3e61b2b10ee28c12 100644
--- a/doc/src/web-content.qdoc
+++ b/doc/src/web-content.qdoc
@@ -40,16 +40,16 @@ accessible to remote clients.
\section1 WebEngine in Qt
-Qt provides the Chromium-based Qt WebEngine module for applications
+Qt provides the Chromium-based \l{Qt WebEngine} module for applications
targeting desktop and embedded platforms. For example, a web browser
application for Linux platform.
-It also provides the Qt WebView module, which uses the native web engine
+It also provides the \l {Qt WebView} module, which uses the native web engine
of the platform. For example, a RSS feed reader Qt Quick application for
Android and iOS.
-These pages contain information about porting applications to use Qt WebEngine
-and the various APIs:
+These pages contain information about porting applications to use
+ \l{Qt WebEngine} and the various APIs:
\list
\li \l{Qt WebEngine Overview}
\li \l{Qt WebView}
diff --git a/doc/src/whatsnew/whatsnew50.qdoc b/doc/src/whatsnew/whatsnew50.qdoc
index 70a4edce238317abb96aba52acb6da0ddf086ffd..13d6823919b766ab48bf0a634caffe396efbd47f 100644
--- a/doc/src/whatsnew/whatsnew50.qdoc
+++ b/doc/src/whatsnew/whatsnew50.qdoc
@@ -225,7 +225,7 @@
\li New \l{AnimatedSprite} type for drawing single sprite animations.
\endlist
- \section2 Text
+ \section2 Changes to the Text types
\list
\li \l{Text}:
\list
diff --git a/doc/src/whatsnew/whatsnew51.qdoc b/doc/src/whatsnew/whatsnew51.qdoc
index dc555d1ca6d4554474b0b35fa6079e72cadc36df..6125659cf0778263c017dcd4783f22da3309a6dd 100644
--- a/doc/src/whatsnew/whatsnew51.qdoc
+++ b/doc/src/whatsnew/whatsnew51.qdoc
@@ -44,9 +44,9 @@
platforms.
\list
- \li \l{Qt Quick Controls} - a set of reusable UI controls. Qt 5.1
- targets desktop platforms, while future releases will include more features
- useful on touch devices.
+ \li \l{Qt Quick Controls 1}{Qt Quick Controls} - a set of reusable UI
+ controls. Qt 5.1 targets desktop platforms, while future releases will
+ include more features useful on touch devices.
\li \l{Qt Quick Layouts} - provides layouts for \l{Qt Quick}
diff --git a/doc/src/whatsnew/whatsnew52.qdoc b/doc/src/whatsnew/whatsnew52.qdoc
index 462d58cdd06157a61793c20e8d121b45b9c2752e..afb94174dea1fbeab3852f4f039f511010816d36 100644
--- a/doc/src/whatsnew/whatsnew52.qdoc
+++ b/doc/src/whatsnew/whatsnew52.qdoc
@@ -165,10 +165,10 @@
\section2 Qt Quick Controls Module
\list
\li Added support for an editable combo box
- \li Added support for multi-selection in \l TableView
- \li Added support for setting columns movable in \l TableView
- \li Added \l Switch type
- \li Added \l BusyIndicator type
+ \li Added support for multi-selection in \l [QtQuickControls1] TableView
+ \li Added support for setting columns movable in \l [QtQuickControls1] TableView
+ \li Added \l [QtQuickControls1] Switch type
+ \li Added \l [QtQuickControls1] BusyIndicator type
\li Simplified deployment
\endlist
diff --git a/examples/demos/photoviewer/doc/src/photoviewer.qdoc b/examples/demos/photoviewer/doc/src/photoviewer.qdoc
index da9029f8170181a513597f5d8974692f9880868f..bebeb9b52d794ceb956ac76e092f7efd1896bcd3 100644
--- a/examples/demos/photoviewer/doc/src/photoviewer.qdoc
+++ b/examples/demos/photoviewer/doc/src/photoviewer.qdoc
@@ -38,7 +38,7 @@
\list
\li Using custom types to create screens and screen controls.
- \li Using Qt Quick Controls to create an application window.
+ \li Using Qt Quick Controls 1 to create an application window.
\li Using the \l Package type with a \l DelegateModel to provide
delegates with a shared context to multiple views.
\li Using XML list models to download Flickr feeds.