Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into tqtc/lts-5.15-opensourcev5.15.12-lts-lgpl

Change-Id: I9ce6e3a31ad7f296e7272e7c775e1a031b2ff627

6 files changed, 17 insertions, 12 deletions

diff --git a/.qmake.conf b/.qmake.conf
index f35b1d6bd..0898bebce 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.15.11
+MODULE_VERSION = 5.15.12
diff --git a/doc/src/connectivity.qdoc b/doc/src/connectivity.qdoc
index 67e59fa15..00d8c9af0 100644
--- a/doc/src/connectivity.qdoc
+++ b/doc/src/connectivity.qdoc
@@ -81,8 +81,7 @@ that there is no HTTP server class in Qt.
 
 For secure communication via SSL, Qt Network offers a wide range of classes
 alongside the central QSslSocket, e.g. QSslCertificate, QSslConfiguration and
-QSslError. The only supported backend for SSL in Qt is OpenSSL, which needs to
-be installed separately.
+QSslError.
 
 For mobile devices, Qt Network offers the \l{Bearer Management}{bearer
 management} API to track the status of a connection (e.g. getting notified about
diff --git a/doc/src/frameworks-technologies/why-moc.qdoc b/doc/src/frameworks-technologies/why-moc.qdoc
index bb90e2658..68d4bcf6c 100644
--- a/doc/src/frameworks-technologies/why-moc.qdoc
+++ b/doc/src/frameworks-technologies/why-moc.qdoc
@@ -44,7 +44,7 @@
     hack with templates at the cost of code size, readability,
     portability, usability, extensability, robustness and ultimately
     design beauty. Both templates and the C preprocessor can be stretched
-    to do incredibility smart and mind boggling things. But just because
+    to do incredibly smart and mind boggling things. But just because
     those things can be done, it does not necessarily mean doing them is the
     right design choice. Code, unfortunately, is not meant to be published in
     books, but compiled with real-world compilers on real-world operating
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index afaab17bd..069add386 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,20 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.15.12
+
+    \section2 Qt Core Module
+
+    \list
+        \li \l{zlib}{Data Compression Library (zlib)} was updated to version 1.2.13.
+    \endlist
+
+    \section2 Qt GUI Module
+
+    \list
+        \li \l{libpng}{LibPNG} got updated to upstream version 1.6.38.
+    \endlist
+
     \section1 Qt 5.15.11
 
     \section2 Qt GUI Module
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index d15abf511..4a8e38f9e 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -747,10 +747,6 @@
     above. Do this by adding them to the \c LIBS variable in your
     project file.
 
-    From Qt version 5.2 onwards, the officially supported version for
-    OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might work,
-    but are not guaranteed to.
-
     \section2 Qt Plugins
 
     All Qt GUI applications require a plugin that implements the \l {Qt
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index cb67bd522..515dee2e9 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -1039,10 +1039,6 @@
     When looking at the plugin DLLs the exact same dependencies
     are listed.
 
-    From Qt version 5.2 onwards, the officially supported version
-    for OpenSSL is 1.0.0 or later. Versions >= 0.9.7 and < 1.0.0 might
-    work, but are not guaranteed to.
-
     \section2 Qt Plugins
 
     All Qt GUI applications require a plugin that implements the \l {Qt