Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/text/qlocale.cpp
	src/network/access/qnetworkaccessmanager.cpp

Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt

Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01

4 files changed, 27 insertions, 13 deletions

diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index fc46bcb74b..6fe0059bf7 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -279,11 +279,22 @@ contains(all_qt_module_deps, qml): \
     for (QMLPATH, QMLPATHS): \
         IMPORTPATHS += -importPath $$system_quote($$QMLPATH)
 
-    # add qrc files, too
-    !isEmpty(RESOURCES) {
-       IMPORTPATHS += -qrcFiles
-       for (RESOURCE, RESOURCES): \
-           IMPORTPATHS += $$absolute_path($$system_quote($$RESOURCE), $$_PRO_FILE_PWD_)
+    # add resources to qmlimportscanner
+    for (RESOURCE, RESOURCES) {
+        defined($${RESOURCE}.files, var) {
+            # in case of a "struct", add the struct's files
+            base = $$RESOURCE.base
+            for (f, $$RESOURCE.files): SCANNERRESOURCES += "$$base/$$f"
+        } else {
+            # if the resource is a file, just add it
+            SCANNERRESOURCES += $$RESOURCE
+        }
+    }
+
+    !isEmpty(SCANNERRESOURCES) {
+        IMPORTPATHS += -qrcFiles
+        for (RESOURCE, SCANNERRESOURCES)
+            IMPORTPATHS += $$absolute_path($$system_quote($$RESOURCE), $$_PRO_FILE_PWD_)
     }
 
 
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 72b47bce27..15b373ba40 100644
--- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf
@@ -74,6 +74,7 @@ sourcefiles += \
 extras = \
     $$_PRO_FILE_PWD_/README \
     $$_PRO_FILE_PWD_/README.TXT \
+    $$_PRO_FILE_PWD_/qmldir \
     $$files($$_PRO_FILE_PWD_/*.pri) \
     $$replace(_PRO_FILE_, \\.pro$, .qmlproject) \
     $$replace(_PRO_FILE_, \\.pro$, .json) \
@@ -140,6 +141,9 @@ equals(TEMPLATE, app)|equals(TEMPLATE, lib) {
     SOURCES =
     OBJECTIVE_SOURCES =
     INSTALLS -= target
+    QMAKE_SUBSTITUTES =
+    QMAKE_EXTRA_COMPILERS =
+    COPIES =
 } else {
     CONFIG += relative_qt_rpath  # Examples built as part of Qt should be relocatable
 }
diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index c1b6f38a6c..088b39ff3f 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -43,7 +43,7 @@ macx-xcode {
             warning("You need to update Xcode to version 6 or newer to fully support iPhone6/6+")
         } else {
             # Set up default LaunchScreen to support iPhone6/6+
-            qmake_launch_screen = LaunchScreen.xib
+            qmake_launch_screen = LaunchScreen.storyboard
             qmake_copy_launch_screen.input = $$QMAKESPEC/$$qmake_launch_screen
             qmake_copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_screen
             QMAKE_SUBSTITUTES += qmake_copy_launch_screen
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index 22bda003fb..279971bd65 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -36,8 +36,9 @@
                 VCLIBS = $${VCLIBS}.Debug
             else: \
                 VCLIBS = $${VCLIBS}
-            # VS 2017 still uses vclibs 140
+            # VS 2017 and 2019 still use vclibs 140
             contains(MSVC_VER, "15.0"): VCLIBS = $$replace(VCLIBS, 150, 140)
+            contains(MSVC_VER, "16.0"): VCLIBS = $$replace(VCLIBS, 160, 140)
             VCLIBS = "$${VCLIBS}\" MinVersion=\"14.0.0.0\" Publisher=\"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
             WINRT_MANIFEST.dependencies += $$VCLIBS
         }
@@ -68,12 +69,10 @@
         isEmpty(WINRT_MANIFEST.background): WINRT_MANIFEST.background = green
         isEmpty(WINRT_MANIFEST.foreground): WINRT_MANIFEST.foreground = light
         isEmpty(WINRT_MANIFEST.default_language): WINRT_MANIFEST.default_language = en
-        *-msvc2015|*-msvc2017 {
-            isEmpty(WINRT_MANIFEST.minVersion): \
-                WINRT_MANIFEST.minVersion = $$WINDOWS_TARGET_PLATFORM_VERSION
-            isEmpty(WINRT_MANIFEST.maxVersionTested): \
-                WINRT_MANIFEST.maxVersionTested = $$WINDOWS_TARGET_PLATFORM_MIN_VERSION
-        }
+        isEmpty(WINRT_MANIFEST.minVersion): \
+            WINRT_MANIFEST.minVersion = $$WINDOWS_TARGET_PLATFORM_VERSION
+        isEmpty(WINRT_MANIFEST.maxVersionTested): \
+            WINRT_MANIFEST.maxVersionTested = $$WINDOWS_TARGET_PLATFORM_MIN_VERSION
 
         INDENT = "$$escape_expand(\\r\\n)        "