From 9bc8acc6cbc1b29f53c06e96cd17c342443ef673 Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Date: Wed, 8 Jul 2015 13:31:20 +0200
Subject: [PATCH] WinRT: Add dependency support for Win10

So far the dependency keyword has been ignored for the new Windows 10
mkspecs. The difference to older manifest files is that there is already
a <Dependency> section and hence we embed dependencies inside this one,
as the format standard does not allow to have multiple of those.

Change-Id: I1bf25979cc28d5c153215de5bb9cd6f37e9c50aa
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
---
 .../winrt_winphone/manifests/10.0/AppxManifest.xml.in    | 2 +-
 .../winrt_winphone/manifests/8.1/AppxManifest.xml.in     | 4 +++-
 .../winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in  | 4 +++-
 mkspecs/features/winrt/package_manifest.prf              | 9 +++++----
 4 files changed, 12 insertions(+), 7 deletions(-)

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..4ef1256383 100644
--- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
@@ -20,7 +20,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/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index bdac0fb2c6..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)
     }