Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I68aacf7b5095efd43d5d338af4a6593d53979a94

10 files changed, 19 insertions, 16 deletions

diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc
index b0f856ac..f0511eb8 100644
--- a/doc/src/development/cmake-manual.qdoc
+++ b/doc/src/development/cmake-manual.qdoc
@@ -29,7 +29,8 @@
 
 /*!
     \page cmake-manual.html
-    \title CMake Manual
+    \target CMake Manual
+    \title Building with CMake
 
     \c {CMake} is a tool that helps simplify the build process for
     development projects across different platforms.  \c{CMake}
@@ -37,7 +38,7 @@
     files.
 
     \c{CMake} is a 3rd party tool with its own \l{CMake Documentation}{documentation}.
-    The rest of this manual details the specifics of how to use Qt 5 with \c{CMake}.
+    The rest of this topic details the specifics of how to use Qt 5 with \c{CMake}.
     The minimum version required to use Qt5 is \c{CMake} 3.1.0.
 
     \section1 Getting Started
@@ -56,8 +57,8 @@
     \snippet snippets/cmake/CMakeLists.pro 0
 
     In order for \c{find_package} to be successful, Qt 5 must be found below the CMAKE_PREFIX_PATH,
-    or the Qt5<Module>_DIR must be set in the \c{CMake} cache to the location of the
-    Qt5WidgetsConfig.cmake file. The easiest way to use \c{CMake} is to set the CMAKE_PREFIX_PATH
+    or the \c{Qt5_DIR} must be set in the \c{CMake} cache to the location of the
+    \c{Qt5Config.cmake} file. The easiest way to use \c{CMake} is to set the CMAKE_PREFIX_PATH
     environment variable to the install prefix of Qt 5.
 
     The CMAKE_AUTOMOC setting runs moc automatically when required. For more on this feature see
@@ -105,7 +106,8 @@
     for use. The name of the imported target for each module matches the name of the module with a
     prefix of 'Qt5::', for example Qt5::Widgets. All of the package-specific variables have a
     consistent name with a prefix of the name of the package. For example,
-    \c{find_package}(Qt5Widgets) will make the following variables available if successfully found:
+    \c{find_package(Qt5 COMPONENTS Widgets)} will make the following variables available
+    if successfully found:
 
     \list
     \li Qt5Widgets_VERSION String describing the version of the module.
diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc
index dfdf1b8e..ec2b3360 100644
--- a/doc/src/developmenttools.qdoc
+++ b/doc/src/developmenttools.qdoc
@@ -61,7 +61,7 @@
             Qt Designer from Qt Creator in the Design mode (1).
         \li \l{qmake Manual}{qmake} for building applications for different
             target platforms. You can also use other build automation tools,
-            such as \l{CMake Manual}{CMake}, \l{Qbs Manual}{Qbs}, or Autotools.
+            such as \l{CMake Documentation}{CMake}, \l{Qbs Manual}{Qbs}, or Autotools.
             When using qmake or CMake, you specify the build system in the
             Projects mode (2). When using Qbs or Autotools, you open a .qbs or
             .am file in Qt Creator.
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index fbeb359b..fe44e67b 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -43,7 +43,7 @@
     qtmain is a helper library that enables the developer to write a
     cross-platform main() function on Windows.
     If you do not use \l qmake, \l {Qbs Manual}{qbs}, or other build tools such as
-    \l{CMake Manual}{CMake}, then you need to link against the
+    \l{CMake Documentation}{CMake}, then you need to link against the
     \c qtmain library.
 
     The qtmain library is statically linked with the application.
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 1cd2d6a9..8d02b1ff 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -175,7 +175,7 @@ by installing the latest \c build-tools, \c platform-tools, \c emulator, and \c
 packages:
 
 \badcode
-./android update sdk
+./bin/sdkmanager --update
 \endcode
 
 To install a specific package, use \c sdkmanager from
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index 2123d969..f967fc0d 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -107,6 +107,7 @@
 
   \section1 Platform Plugins for Embedded Linux Devices
 
+  \target embedded eglfs
   \section2 EGLFS
 
   \l {http://www.khronos.org/egl}{EGL} is an interface between OpenGL and the
diff --git a/doc/src/platforms/qpa.qdoc b/doc/src/platforms/qpa.qdoc
index 1d2aebee..1abedebe 100644
--- a/doc/src/platforms/qpa.qdoc
+++ b/doc/src/platforms/qpa.qdoc
@@ -132,7 +132,7 @@ The following table summarizes the platform plugins available for QPA:
 \row
     \li \c qeglfs
     \li QEglFSIntegrationPlugin
-    \li \l EGLFS support for embedded Linux devices.
+    \li \l{embedded eglfs}{EGLFS} support for embedded Linux devices.
 \row
     \li \c qhaiku
     \li QHaikuIntegration
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 4c114539..553c33f2 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -114,7 +114,7 @@
     \endcode
 
     On Windows, if you do not use \l qmake
-    or other build tools such as \l{CMake Manual}{CMake}, you also need to link against
+    or other build tools such as \l{CMake Documentation}{CMake}, you also need to link against
     the \c qtmain library.
 
     \section1 Qt Add-Ons
diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc
index 797d9ca4..19f54128 100644
--- a/doc/src/reference.qdoc
+++ b/doc/src/reference.qdoc
@@ -50,7 +50,6 @@
     \li \l{Qt Assistant Manual}{Qt Assistant}
     \li \l{Qt Designer Manual}{Qt Designer}
     \li \l{qmake Manual}{qmake}
-    \li \l{CMake Manual}{Using Qt with CMake}
     \li \l{QDoc Manual}{qdoc}
     \endlist
 
diff --git a/doc/src/snippets/cmake/CMakeLists.pro b/doc/src/snippets/cmake/CMakeLists.pro
index b2018342..6f66cabf 100644
--- a/doc/src/snippets/cmake/CMakeLists.pro
+++ b/doc/src/snippets/cmake/CMakeLists.pro
@@ -11,7 +11,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 
 # Find the QtWidgets library
-find_package(Qt5Widgets CONFIG REQUIRED)
+find_package(Qt5 COMPONENTS Widgets REQUIRED)
 
 # Populate a CMake variable with the sources
 set(helloworld_SRCS
@@ -26,13 +26,13 @@ target_link_libraries(helloworld Qt5::Widgets)
 #! [0]
 
 #! [1]
-find_package(Qt5Core)
+find_package(Qt5 COMPONENTS Core REQUIRED)
 
 get_target_property(QtCore_location Qt5::Core LOCATION)
 #! [1]
 
 #! [2]
-find_package(Qt5Core)
+find_package(Qt5 COMPONENTS Core REQUIRED)
 
 set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage")
 
diff --git a/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
index 1eb7cac7..a1822197 100644
--- a/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
+++ b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs
@@ -57,8 +57,9 @@ export function getHeight(string) {
 }
 
 export function getImagePath(string) {
-    var pattern = /src=\"http:\/\/(\S+)\"/
-    return (string.match(pattern))[1]
+    var pattern = /src=\"https?:\/\/(\S+)\"/
+    var match = string.match(pattern)
+    return match ? match[1] : ""
 }
 
 export function calculateScale(width, height, cellSize) {