Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf

Change-Id: Ie7684951e10e119872147396d47118b928fce93d

4 files changed, 120 insertions, 12 deletions

diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 00000000..d49a42f5
--- /dev/null
+++ b/dist/changes-5.9.4
@@ -0,0 +1,25 @@
+Qt 5.9.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+****************************************************************************
+*                               Qt 5.9.4 Changes                           *
+****************************************************************************
+
+ - This release contains only minor code improvements.
+
diff --git a/doc/src/legal/android-runtime-licensing-notes.qdoc b/doc/src/legal/android-runtime-licensing-notes.qdoc
index dd9a92bc..772bed44 100644
--- a/doc/src/legal/android-runtime-licensing-notes.qdoc
+++ b/doc/src/legal/android-runtime-licensing-notes.qdoc
@@ -35,17 +35,19 @@ The Android platform does not provide a full implementation of the C++ run-time.
 apps that depend on features such as STL, exceptions, or RTTI, must include an additional
 native run-time library that provides the features they need.
 
-Qt will by default use the GNU libstdc++ library which is distributed as part of the Google Android NDK.
-Qt Creator will copy this library into the .APK for any Qt-based Android app. The library will then be
-loaded by the app on start-up to meet the run-time requirements of Qt.
-
-The GNU C++ run-time is licensed under the
+When built with g++, Qt will use the GNU libstdc++ library which is distributed as part of the Google
+Android NDK. Qt Creator will copy this library into the .APK for any Qt-based Android app. The library
+will then be loaded by the app on start-up to meet the run-time requirements of Qt.The GNU C++ run-time
+is licensed under the
 \l{http://gcc.gnu.org/onlinedocs/libstdc++/manual/appendix_gpl.html}{GNU General Public License version 3} with
 an exception which grants permission for run-time linking and usage of the library by an application which
 would otherwise violate the terms of the main license. For more information about this exception, see
 \l{http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html}{the official license page}.
 
-\section1 Information About License From GCC Headers
+When Qt is built with clang instead, it will use LLVM's libc++, which is dual-licensed under both the
+University of Illinois "BSD-Like" license and the MIT license.
+
+\section1 Information About The GNU C++ Run-time License From GCC Headers
 
 This file is part of the GNU ISO C++ Library.  This library is free
 software; you can redistribute it and/or modify it under the terms
@@ -142,6 +144,84 @@ The availability of this Exception does not imply any general
 presumption that third-party software is unaffected by the copyleft
 requirements of the license of GCC.
 
+\section1 Information About The LLVM C++ Run-time License
+
+==============================================================================
+libc++ License
+==============================================================================
+
+The libc++ library is dual licensed under both the University of Illinois
+"BSD-Like" license and the MIT license.  As a user of this code you may choose
+to use it under either license.  As a contributor, you agree to allow your code
+to be used under both.
+
+Full text of the relevant licenses is included below.
+
+==============================================================================
+
+University of Illinois/NCSA
+Open Source License
+
+Copyright (c) 2009-2017 by the contributors listed in CREDITS.TXT
+
+All rights reserved.
+
+Developed by:
+
+    LLVM Team
+
+    University of Illinois at Urbana-Champaign
+
+    http://llvm.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal with
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimers.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimers in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the names of the LLVM Team, University of Illinois at
+      Urbana-Champaign, nor the names of its contributors may be used to
+      endorse or promote products derived from this Software without specific
+      prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
+
+==============================================================================
+
+Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 
 */
 
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 485385b7..cd2f643b 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -55,6 +55,8 @@
     \section1 License Information
 
     \badcode
+    Copyright (C) 2016 The Qt Company Ltd.
+
     Commercial License Usage
     Licensees holding valid commercial Qt licenses may use this file in
     accordance with the commercial license agreement provided with the
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index ee880b3f..f9f7a496 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -153,6 +153,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li MSVC 2017, MSVC 2015, MSVC 2013, MinGW 5.3
          \li \l{https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/5.3.0/threads-posix/dwarf/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z/download}{MinGW-builds gcc 5.3.0 (32-bit)}
 
+    \row \li {3,1} \header \li {3,1} Universal Windows Platform (UWP)
+    \row \li UWP 10 (x86, \b x86_64, armv7)
+         \li MSVC 2017, \b {MSVC 2015}
+         \li Hosts: \b {Windows 10}
+
     \row \li {3,1} \header \li {3,1} \l {Qt for Linux/X11}{Linux/X11}
     \row \li openSUSE 42.1 (64-bit)
          \li \b {GCC 4.8.5}
@@ -180,7 +185,7 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \l{Qt for VxWorks}{VxWorks}
     \row \li \l {Qt for Embedded Linux}{Embedded Linux}
          \li GCC \li ARM Cortex-A, Intel boards with GCC-based toolchains
-    \row \li QNX 6.6.0, 7.0 (armv7le and x86)
+    \row \li QNX 6.6 (armv7le and x86), 7.0 (armv7le, arm64 and x86)
          \li \b {GCC as provided by QNX}
          \li Hosts: \b {RHEL 6.6 (64-bit)}, \b {RHEL 7.2 (64-bit)},
              \b {Windows 10 (64-bit)}, \b {Windows 7 (32-bit)}
@@ -192,11 +197,7 @@ Mobile Platforms: \l {Qt for Android}{Android},
          \li Hosts: 64-bit Linux, Windows
 
     \row \li {3,1} \header \li {3,1}
-          Mobile Platforms: \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS},
-          Universal Windows Platform (UWP)
-    \row \li Universal Windows Platform (UWP) (x86, \b x86_64, armv7)
-         \li MSVC 2017, \b {MSVC 2015}
-         \li Hosts: \b {Windows 10}
+          Mobile Platforms: \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS}
     \row \li iOS 8, 9, 10 (armv7, arm64)
          \li \b {Clang as provided by Apple}
          \li \b {\macos 10.10 host}