Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl

Change-Id: I840bfab4ceb870661e8accb5252e455c14833704

11 files changed, 41 insertions, 15 deletions

diff --git a/.qmake.conf b/.qmake.conf
index c9b2fcc13..a2fd3976f 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.15.5
+MODULE_VERSION = 5.15.6
diff --git a/doc/config/images/232cwcW5atA.jpg b/doc/config/images/232cwcW5atA.jpg
new file mode 100644
index 000000000..0357f63d5
--- /dev/null
+++ b/doc/config/images/232cwcW5atA.jpg
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 2447be4e4..b99792871 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -67,5 +67,11 @@ macro.indextitle              = "\\title Qt $QT_VER"
 macro.qtver                   = "$QT_VER"
 
 # Config to enable YouTube links in the offline documentation
-HTML.extraimages += ../images/I5jasWrsxT0.jpg
-qhp.QtDoc.extraFiles += ../images/I5jasWrsxT0.jpg
+{HTML.extraimages,qhp.QtDoc.extraFiles} += images/232cwcW5atA.jpg
+
+manifestmeta.highlighted.names = "QtDoc/Coffee Machine Example" \
+                                 "QtDoc/Qt Quick Demo - Same Game"
+
+manifestmeta.filters += coffeemachine
+manifestmeta.coffeemachine.names = "QtDoc/Coffee Machine Example"
+manifestmeta.coffeemachine.tags = quick,embedded
diff --git a/doc/src/frameworks-technologies/unicode.qdoc b/doc/src/frameworks-technologies/unicode.qdoc
index 93559d7a9..10731e5fe 100644
--- a/doc/src/frameworks-technologies/unicode.qdoc
+++ b/doc/src/frameworks-technologies/unicode.qdoc
@@ -45,7 +45,7 @@
     \keyword Unicode
 
 
-    \l{http://www.unicode.org/}{Unicode}
+    \l{https://www.unicode.org/}{Unicode}
     is the standard for encoding text in almost all languages
     spoken in the world. It is nowadays used as the native encoding
     for text on most modern operating systems. The major exception is
@@ -62,15 +62,15 @@
 
     \section1 Information about Unicode on the Web
 
-    The \l{http://www.unicode.org/}{Unicode Consortium} has a number
+    The \l{https://www.unicode.org/}{Unicode Consortium} has a number
     of documents available, including
 
     \list
 
-    \li \l{http://www.unicode.org/versions/latest/}{The current version of the standard}
-    \li \l{http://www.unicode.org/standard/principles.html}{A
+    \li \l{https://www.unicode.org/versions/latest/}{The current version of the standard}
+    \li \l{https://www.unicode.org/standard/principles.html}{A
     technical introduction to Unicode}
-    \li \l{http://www.unicode.org/standard/standard.html}{The
+    \li \l{https://www.unicode.org/standard/standard.html}{The
     home page for the standard}
 
     \endlist
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 80fee5f94..79435e47b 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -82,7 +82,7 @@
     The following YouTube video gives a complete walk-through of the
     installation process:
 
-    \youtube wPcVlP_wrew
+    \youtube 232cwcW5atA
 
     \section2 Updating or Removing Qt
 
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 7793c8e45..e05bc834c 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -130,7 +130,7 @@
     \li \b{Bidirectional writing.} Arabic and Hebrew are written from right to
     left, except for numbers and embedded English text which is written
     left to right. The exact behavior is defined in the
-    \l{http://www.unicode.org/unicode/reports/tr9/}{Unicode Technical Annex #9}.
+    \l{https://www.unicode.org/unicode/reports/tr9/}{Unicode Technical Annex #9}.
 
     \li \b{Non-spacing or diacritical marks (accents or umlauts in European
     languages).} Some languages such as Vietnamese make extensive use of
diff --git a/doc/src/legal/licensechanges.qdoc b/doc/src/legal/licensechanges.qdoc
index 2122321cf..9da78d120 100644
--- a/doc/src/legal/licensechanges.qdoc
+++ b/doc/src/legal/licensechanges.qdoc
@@ -34,6 +34,25 @@
     Changes in Qt and \l{Licenses Used in Qt}{Third Party Modules}
     released with Qt that are relevant to licensing.
 
+    \section1 Qt 5.15.6
+
+    \section2 Qt Core Module
+
+    \l{unicode-cldr}{Unicode Common Locale Data Repository (CLDR)} got updated to
+    upstream version v39.
+
+    \section2 Qt GUI Module
+
+    \list
+        \li \l{freetype}{Freetype 2} got updated to upstream version 2.10.4.
+        \li \l{md4c}{MD4C} got updated to upstream version 0.4.8.
+    \endlist
+
+    \section2 Qt Image Formats
+
+    \l{libtiff}{TIFF Software Distribution (libtiff)} got updated to upstream
+    version 4.3.0.
+
     \section1 Qt 5.15.5
 
     \section2 Qt Core Module
diff --git a/doc/src/platforms/android/android-services.qdoc b/doc/src/platforms/android/android-services.qdoc
index bcaba1556..7436b1958 100644
--- a/doc/src/platforms/android/android-services.qdoc
+++ b/doc/src/platforms/android/android-services.qdoc
@@ -165,7 +165,7 @@ Also, add the \c receiver definition in the body of the \c <application> section
 
 \note Android 8.0 introduced some limitations on running background services,
 which means using a nomal \c Service class might not work. For more information,
-see Android's recommendation to use either \c {Android: Foreground services}{Foreground services}
+see Android's recommendation to use either \l {Android: Foreground services}{Foreground services}
 or \l {Android: JobIntentService}{JobIntentService}.
 
 \section2 Manage the Service in AndroidMnifest.xml
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 073a6199f..26bcea942 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -64,7 +64,7 @@
     \header \li Target Platform \li Architecture \li Build Environment
     \row \li \macos 10.13, 10.14, \b 10.15
         \li \c x86_64 and \c x86_64h
-        \li Xcode 11 or \b 12 (10.15 SDK)
+        \li Xcode 11 or \b 12 (11.1 SDK)
 \endtable
 //! [macos]
 
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index 12fedb19d..e1ad13696 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -104,8 +104,8 @@ If we save that document as "HelloWorld.qml", we can load and display it.
 
 To display the graphical scene defined by the QML document, it may be loaded
 with \l{Qt Creator Manual}{Qt Creator}. For simple UI files such as this one,
-select \gui{File > New File or Project > Applications > Qt Quick UI} from
-within Qt Creator.
+select \gui{File > New File or Project > Application (Qt Quick) > Qt Quick
+Application - Empty} from within Qt Creator.
 
 Pressing the green \gui{Run} button runs the application. You should see the
 text \gui{Hello, World!} in the center of a red rectangle.
diff --git a/doc/src/wayland-and-qt.qdoc b/doc/src/wayland-and-qt.qdoc
index f73340073..d65eb1e44 100644
--- a/doc/src/wayland-and-qt.qdoc
+++ b/doc/src/wayland-and-qt.qdoc
@@ -252,7 +252,8 @@
 
   \section2 Related Content
   \list
-    \li \l{https://resources.qt.io/qt-world-summit-2017/qtws17-qt-wayland-compositor-creating-multi-process-user-interface-johan-helsing-the-qt-company}{QtWS17 - Qt Wayland Compositor: Creating multi-process user interface}
+    \li \l{https://resources.qt.io/videos/qtws17-qt-wayland-compositor-creating-multi-process-user-interface-johan-helsing-the-qt-company}
+        {QtWS17 - Qt Wayland Compositor: Creating multi-process user interface}
     \li \l{https://doc.qt.io/QtApplicationManager/introduction.html}{Qt Application Manager}
   \endlist