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

2 files changed, 5 insertions, 4 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}