Merge remote-tracking branch 'origin/5.7.1' into 5.7

Change-Id: I1166ae57d05286d978fe38d9d706ecb72d8cb38c

6 files changed, 51 insertions, 24 deletions

diff --git a/dist/changes-5.7.1 b/dist/changes-5.7.1
new file mode 100644
index 00000000..2cc63e5d
--- /dev/null
+++ b/dist/changes-5.7.1
@@ -0,0 +1,27 @@
+Qt 5.7.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.7.0.
+
+For more details, refer to the documentation included in this distribution.
+The documentation is also available online:
+
+  https://doc.qt.io/qt-5/
+
+The Qt version 5.7 series is binary compatible with the 5.6.x series.
+Applications compiled for 5.6 will continue to run with 5.7.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+This release contains all fixes included in the Qt 5.6.2 release.
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+  - Updated information on installers, Qt account and license keys.
+  - Updated QML coding conventions to mention semicolon usage.
+  - Fixed incorrect information in supported platforms.
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 723ba681..ea724043 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -233,7 +233,7 @@
 */
 
 /*!
-    \externalpage http://www.qt.io/qt-account/
+    \externalpage https://account.qt.io/
     \title Qt Account
 */
 
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 6d1226d9..a4db0bca 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -31,13 +31,19 @@
     \brief A quick guide for developers
 
     You can install the Qt Framework and tools by using an online or offline
-    installer or by building the source packages yourself. In the
-    \e{online installer}, you can select the Qt versions, tools, and Add-On
-    components to download and install depending on the license attached to your
-    \l{Qt Account}.
+    installer or by building the source packages yourself.
+
+    In the \e{online installer}, you can select commercial or open source
+    versions of Qt, tools, and Add-On components to install. Using the online
+    installer requires signing in to your \l{Qt Account}. The installer
+    retrieves the license attached to the account from a server and provides a
+    list of available components corresponding to the license.
 
     An \e{offline installer} is a single package that contains all of Qt and
-    Add-Ons relevant for a target platform.
+    Add-Ons relevant for a target platform. Users with a commercial license
+    can either sign in with their Qt account or with their Qt license key
+    during the installation process. The license key is available in the
+    \l {Qt Account} Web portal.
 
     You can download Qt 5 installers from the \l Downloads page.
 
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 86d49d82..f511fc34 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -359,11 +359,11 @@
     Qt for X11 has some requirements that are given in more detail
     in the \l{Qt for X11 Requirements} document.
 
-    \section1 Step 1: Installing the License File (Commercial Editions Only)
-        If you have the commercial edition of Qt, install your license
-        file as \c{$HOME/.qt-license}.
+    \section1 Step 1: Installing the License File (Commercially Licensed Qt Only)
 
-        For the open source version you do not need a license file.
+        If you have a commercial Qt license, download the license file
+        from your \l {Qt Account} Web portal and save it as
+        \c{$HOME/.qt-license}.
 
     \section1 Step 2: Unpacking the Archive
         Unpack the archive if you have not done so already. For example,
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index d7b83600..1ae918c7 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -193,11 +193,11 @@
     You can download the Qt 5 sources from the \l{Downloads} page. For
     more information, visit the \l{Getting Started with Qt} page.
 
-    \section1 Step 1: Install the License File (Commercial Editions Only)
-        If you have the commercial edition of Qt, install your license
-        file as \c{$HOME/.qt-license}.
+    \section1 Step 1: Install the License File (Commercially Licensed Qt Only)
 
-        For the open source version you do not need a license file.
+        If you have a commercial Qt license, download the license file
+        from your \l {Qt Account} Web portal and save it as
+        \c{$HOME/.qt-license}.
 
         Unpack the archive if you have not done so already. For example,
         if you have the \c{qt-everywhere-opensource-src-%VERSION%.tar.gz}
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index eb66edf7..dbb8545f 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -1023,17 +1023,11 @@
     more information, visit the \l{Getting Started with Qt} page.
 
 
-    \section1 Step 1: Install the License File (Commercial Editions Only)
+    \section1 Step 1: Install the License File (Commercially Licensed Qt Only)
 
-        If you have the commercial edition of Qt, copy the license file
-        from your account on the distribution server into your home directory
-        (this may be known as the \c userprofile environment variable) and
-        rename it to \c{.qt-license}. This renaming process must be done
-        using a \e{command prompt} on Windows, \b{not} with Windows Explorer.
-        For example on Windows 2000, \c{%USERPROFILE%} should be something
-        like \c{C:\Documents and Settings\username}
-
-        For the open source version you do not need a license file.
+        If you have a commercial Qt license, download the license file
+        from your \l {Qt Account} Web portal and save it to your home directory
+        as \c{.qt-license}.
 
     \section1 Step 2: Unpack the Archive