Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	qmake/doc/snippets/code/doc_src_qmake-manual.pro
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/tools/qbytearray.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST

Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c

9 files changed, 41 insertions, 45 deletions

diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index 72e0b98c9c..849048dad0 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -140,7 +140,7 @@ greaterThan(MSC_VER, 1899) {
     QMAKE_CFLAGS       += -Zc:strictStrings
     QMAKE_CFLAGS_WARN_ON += -w44456 -w44457 -w44458
     QMAKE_CFLAGS_AVX2   = -arch:AVX2
-    QMAKE_CXXFLAGS     += -Zc:strictStrings
+    QMAKE_CXXFLAGS     += -Zc:strictStrings -Zc:throwingNew
     QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577
 }
 
diff --git a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
index c6419660c1..9e188084ad 100644
--- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
@@ -9,7 +9,8 @@
   <Identity
     Name=\"$${WINRT_MANIFEST.identity}\"
     Publisher=\"$${WINRT_MANIFEST.publisherid}\"
-    Version=\"$${WINRT_MANIFEST.version}\" />
+    Version=\"$${WINRT_MANIFEST.version}\"
+    ProcessorArchitecture=\"$${WINRT_MANIFEST.architecture}\" />
 
   <mp:PhoneIdentity PhoneProductId=\"$${WINRT_MANIFEST.identity}\" PhonePublisherId=\"$${WINRT_MANIFEST.phone_publisher_id}\"/>
 
@@ -20,7 +21,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.10069.0\" MaxVersionTested=\"10.0.10069.0\" />
+    <TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.10069.0\" MaxVersionTested=\"10.0.10069.0\" />$${WINRT_MANIFEST.dependencies}
   </Dependencies>
 
   <Resources>
diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
index 038184ee4d..91353c608b 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in
@@ -41,6 +41,8 @@
         <m2:SplashScreen Image=\"$${WINRT_MANIFEST.logo_620x300}\" />$${WINRT_MANIFEST.rotation_preference}
       </m2:VisualElements>
     </Application>
-  </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
+  </Applications>$${WINRT_MANIFEST.capabilities}
+  <Dependencies>$${WINRT_MANIFEST.dependencies}
+  </Dependencies>
 </Package>
 <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
diff --git a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
index 67830bd4ad..19deb94675 100644
--- a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in
@@ -42,6 +42,8 @@
         <m3:SplashScreen Image=\"$${WINRT_MANIFEST.logo_480x800}\" />$${WINRT_MANIFEST.rotation_preference}
       </m3:VisualElements>
     </Application>
-  </Applications>$${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies}
+  </Applications>$${WINRT_MANIFEST.capabilities}
+  <Dependencies>$${WINRT_MANIFEST.dependencies}
+  </Dependencies>
 </Package>
 <!-- Generated by qmake using the $$[QMAKE_XSPEC] mkspec. -->
diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf
new file mode 100644
index 0000000000..44e3c94b8a
--- /dev/null
+++ b/mkspecs/features/winrt/default_pre.prf
@@ -0,0 +1,12 @@
+*msvc2015 {
+    # Note that the order is important, ucrt(d) has to be first
+    # Otherwise the linker might use malloc from a different library
+    # but free_dbg() from the runtime, causing assert when deleting
+    # items from different heaps
+    CONFIG(debug, debug|release): \
+        QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS
+    else: \
+        QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS
+}
+
+load(default_pre)
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index 7e5effa438..0f6f185170 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -58,9 +58,11 @@
         VCLIBS = Microsoft.VCLibs.$$replace(MSVC_VER, \\., ).00
         winphone: VCLIBS = $${VCLIBS}.Phone
         CONFIG(debug, debug|release): \
-            WINRT_MANIFEST.dependencies += $${VCLIBS}.Debug
+            VCLIBS = $${VCLIBS}.Debug
         else: \
-            WINRT_MANIFEST.dependencies += $$VCLIBS
+            VCLIBS = $${VCLIBS}
+        contains(MSVC_VER, "14.0"): VCLIBS = "$${VCLIBS}\" MinVersion=\"14.0.0.0\" Publisher=\"CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+        WINRT_MANIFEST.dependencies += $$VCLIBS
     }
 
     # Provide default values for required variables
@@ -122,12 +124,11 @@
     }
 
     # Dependencies are given as a string list. The CRT dependency is added automatically above.
+    # For MSVC2015 the dependencies are added in conjunction with TargetDeviceFamily
     WINRT_MANIFEST.dependencies = $$unique(WINRT_MANIFEST.dependencies)
     !isEmpty(WINRT_MANIFEST.dependencies) {
-        MANIFEST_DEPENDENCIES += "<Dependencies>"
         for(DEPENDENCY, WINRT_MANIFEST.dependencies): \
             MANIFEST_DEPENDENCIES += "  <PackageDependency Name=\"$$DEPENDENCY\" />"
-        MANIFEST_DEPENDENCIES += "</Dependencies>"
 
         WINRT_MANIFEST.dependencies = $$join(MANIFEST_DEPENDENCIES, $$INDENT, $$INDENT)
     }
@@ -159,5 +160,13 @@
         WINRT_MANIFEST.$${ICON_NAME} = assets/$$basename(ICON_FILE)
     }
 
+    !contains(TEMPLATE, "vc.*") {
+        winrt_manifest_install.files = $$manifest_file.output
+        winrt_manifest_install.path = $$target.path
+        winrt_assets_install.files = $$BUILD_DIR/assets/*
+        winrt_assets_install.path = $$target.path/assets
+        INSTALLS += winrt_manifest_install winrt_assets_install
+    }
+
     QMAKE_SUBSTITUTES += manifest_file
 }
diff --git a/mkspecs/winrt-arm-msvc2015/qmake.conf b/mkspecs/winrt-arm-msvc2015/qmake.conf
index fcb6d99aa9..44c91a5e80 100644
--- a/mkspecs/winrt-arm-msvc2015/qmake.conf
+++ b/mkspecs/winrt-arm-msvc2015/qmake.conf
@@ -10,19 +10,9 @@ DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP ARM __ARM__ __arm__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS
-QMAKE_LFLAGS           += /MACHINE:ARM /NODEFAULTLIB:kernel32.lib
+QMAKE_LFLAGS           += /MACHINE:ARM
 
-QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib
-
-# Note that the order is important, ucrt(d) has to be first
-# Otherwise the linker might use malloc from a different library
-# but free_dbg() from the runtime, causing assert when deleting
-# items from different heaps
-CONFIG(debug, debug|release) {
-    QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS
-} else {
-    QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS
-}
+QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib
 
 VCPROJ_ARCH             = ARM
 MSVC_VER                = 14.0
diff --git a/mkspecs/winrt-x64-msvc2015/qmake.conf b/mkspecs/winrt-x64-msvc2015/qmake.conf
index e8062f5364..a6c5db6f0f 100644
--- a/mkspecs/winrt-x64-msvc2015/qmake.conf
+++ b/mkspecs/winrt-x64-msvc2015/qmake.conf
@@ -10,19 +10,9 @@ DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP X64 __X64__ __x64__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS
-QMAKE_LFLAGS           += /MACHINE:X64 /NODEFAULTLIB:kernel32.lib
+QMAKE_LFLAGS           += /MACHINE:X64
 
-QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib
-
-# Note that the order is important, ucrt(d) has to be first
-# Otherwise the linker might use malloc from a different library
-# but free_dbg() from the runtime, causing assert when deleting
-# items from different heaps
-CONFIG(debug, debug|release) {
-    QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS
-} else {
-    QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS
-}
+QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib
 
 VCPROJ_ARCH             = x64
 MSVC_VER                = 14.0
diff --git a/mkspecs/winrt-x86-msvc2015/qmake.conf b/mkspecs/winrt-x86-msvc2015/qmake.conf
index 5b44a97e8d..dfeaf63e2c 100644
--- a/mkspecs/winrt-x86-msvc2015/qmake.conf
+++ b/mkspecs/winrt-x86-msvc2015/qmake.conf
@@ -10,19 +10,9 @@ DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP X86 __X86__ __x86__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS
-QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86 /NODEFAULTLIB:kernel32.lib
+QMAKE_LFLAGS           += /SAFESEH /MACHINE:X86
 
-QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib
-
-# Note that the order is important, ucrt(d) has to be first
-# Otherwise the linker might use malloc from a different library
-# but free_dbg() from the runtime, causing assert when deleting
-# items from different heaps
-CONFIG(debug, debug|release) {
-    QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS
-} else {
-    QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS
-}
+QMAKE_LIBS             += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib
 
 VCPROJ_ARCH             = Win32
 MSVC_VER                = 14.0