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

 Conflicts:
	src/corelib/io/qprocess_win.cpp

Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9

4 files changed, 12 insertions, 5 deletions

diff --git a/src/corelib/doc/snippets/code/src_corelib_concurrent_qthreadpool.cpp b/src/corelib/doc/snippets/code/src_corelib_concurrent_qthreadpool.cpp
index a1372976ae..ba31972aa1 100644
--- a/src/corelib/doc/snippets/code/src_corelib_concurrent_qthreadpool.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_concurrent_qthreadpool.cpp
@@ -55,7 +55,7 @@ class HelloWorldTask : public QRunnable
     {
         qDebug() << "Hello world from thread" << QThread::currentThread();
     }
-}
+};
 
 HelloWorldTask *hello = new HelloWorldTask();
 // QThreadPool takes ownership and deletes 'hello' automatically
diff --git a/src/corelib/doc/src/qtcore-index.qdoc b/src/corelib/doc/src/qtcore-index.qdoc
index 9004c018ed..04af0e9416 100644
--- a/src/corelib/doc/src/qtcore-index.qdoc
+++ b/src/corelib/doc/src/qtcore-index.qdoc
@@ -104,17 +104,18 @@
     \section1 Licenses and Attributions
 
     Qt Core is available under commercial licenses from \l{The Qt Company}.
-    In addition, it is available under the
+    In addition, it is available under free software licenses. Since Qt 5.4,
+    these free software licenses are
     \l{GNU Lesser General Public License, version 3}, or
     the \l{GNU General Public License, version 2}.
     See \l{Qt Licensing} for further details.
 
     Executables on Windows potentially link
     against \l{The qtmain Library}. This library is available
-    under commercial licenses, and in addition under the
+    under commercial licenses and also under the
     \l{BSD 3-clause "New" or "Revised" License}.
 
-    Furthermore Qt Core potentially contains third party
+    Furthermore, Qt Core in Qt \QtVersion may contain third party
     modules under following permissive licenses:
 
     \generatelist{groupsbymodule attributions-qtcore}
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index 8da6d6b16e..e19d45841f 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -101,7 +101,8 @@ static void qt_create_pipe(Q_PIPE *pipe, bool isInputPipe)
     unsigned int attempts = 1000;
     forever {
         _snwprintf(pipeName, sizeof(pipeName) / sizeof(pipeName[0]),
-                L"\\\\.\\pipe\\qt-%X", QRandomGenerator::global()->generate());
+                L"\\\\.\\pipe\\qt-%lX-%X", long(QCoreApplication::applicationPid()),
+                QRandomGenerator::global()->generate());
 
         DWORD dwOpenMode = FILE_FLAG_OVERLAPPED;
         DWORD dwOutputBufferSize = 0;
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index bbc66120b5..4b1b9888d8 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -2366,6 +2366,11 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
         limitations is to store the settings using the IniFormat
         instead of the NativeFormat.
 
+    \li  On Windows, when the Windows system registry is used, QSettings
+         does not preserve the original type of the value. Therefore,
+         the type of the value might change when a new value is set. For
+         example, a value with type \c REG_EXPAND_SZ will change to \c REG_SZ.
+
     \li  On \macos and iOS, allKeys() will return some extra keys for global
         settings that apply to all applications. These keys can be
         read using value() but cannot be changed, only shadowed.