Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12

9 files changed, 119 insertions, 10 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 4d202ddb..384fbf9d 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/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 11529353..fcd2487a 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/legal/bsd.qdoc b/doc/src/legal/bsd.qdoc
new file mode 100644
index 00000000..8ec7c94d
--- /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 add022a4..00ff4588 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 e847d780..c82b5c51 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/qnx.qdoc b/doc/src/platforms/qnx.qdoc
index 026540f9..b307ded9 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/snippets/code/doc_src_bsd.qdoc b/doc/src/snippets/code/doc_src_bsd.qdoc
new file mode 100644
index 00000000..cfb0e036
--- /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/web-content.qdoc b/doc/src/web-content.qdoc
index 37060348..3a593654 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 70a4edce..13d68239 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