Merge tag 'v5.15.8-lts-lgpl' into 5.15

Qt 5.15.8-lts-lgpl Release

4 files changed, 19 insertions, 9 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 95d8da2a..2e7b67b1 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.15.7
+MODULE_VERSION = 5.15.8
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index a27b6a90..cc0abccf 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.8
+
+    \section2 Qt Core Module
+
+    \list
+        \li \l{android-gradle-wrapper}{Gradle wrapper} was updated to version 7.2.0
+        \li \l{pcre2}{PCRE2} was updated to version 10.39
+        \li \l{pcre2-sljit}{PCRE2 - Stack-less Just-In-Time Compiler} was updated to version 10.39
+    \endlist
+
+    \section2 Qt 3D Module
+
+    \l{assimp}{Open Asset Import Library} was updated to version 5.0.1.
+
     \section1 Qt 5.15.7
 
     \section2 Qt Core Module
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index c5e12ef4..1edb4c7f 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -108,15 +108,9 @@
 //! [ios]
 \table 80%
     \header \li Target Platform \li Architecture \li Build Environment \li Notes
-<<<<<<< HEAD
-    \row \li iOS 12, \b{iOS 13}, iOS 14
+    \row \li iOS 12, iOS 13, iOS 14, iOS 15
         \li \c armv8 (\c arm64)
-        \li Xcode \b{11 (iOS 13.2 SDK)}, Xcode 12 (iOS 14 SDK)
-=======
-    \row \li iOS 12, iOS 13, iOS 14
-        \li \c armv8 (\c arm64)
-        \li  Xcode 11 (iOS 13.2 SDK), \b {Xcode 12} (iOS 14 SDK)
->>>>>>> v5.15.7-lts-lgpl
+        \li  Xcode 11 (iOS 13.2 SDK), Xcode 12 (iOS 14 SDK), \b {Xcode 13} (iOS 15 SDK)
         \li
     \row \li tvOS 12, tvOS 13
         \li \c armv8 (\c arm64)
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index 1b40028b..6a676a0c 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -139,6 +139,8 @@ import QtQuick.Controls 2.12
 //window containing the application
 ApplicationWindow {
 
+    visible: true
+
     //title of the application
     title: qsTr("Hello World")
     width: 640