From 2538b53340a4ef1d96b9eb0e43311b1e5ff1c54a Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@theqtcompany.com>
Date: Thu, 8 Oct 2015 11:23:35 +0200
Subject: winrt: Avoid empty <Dependencies> section in manifest files

If that section is there but empty, the manifest cannot be loaded using
the App Manifest Designer in Visual Studio.

Task-number: QTBUG-48648
Change-Id: I529eb2f2a690bececcf5c385b8f96e84ece363d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
---
 mkspecs/features/winrt/package_manifest.prf | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'mkspecs/features')

diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf
index 0f6f185170..9b4a6672e5 100644
--- a/mkspecs/features/winrt/package_manifest.prf
+++ b/mkspecs/features/winrt/package_manifest.prf
@@ -125,10 +125,14 @@
 
     # Dependencies are given as a string list. The CRT dependency is added automatically above.
     # For MSVC2015 the dependencies are added in conjunction with TargetDeviceFamily
+    # Due to the hard coded dependency on "Windows.Universal" the <Dependencies> tag
+    # is already inside the MSVC2015 manifest.
     WINRT_MANIFEST.dependencies = $$unique(WINRT_MANIFEST.dependencies)
     !isEmpty(WINRT_MANIFEST.dependencies) {
+        *-msvc2013: MANIFEST_DEPENDENCIES += "<Dependencies>"
         for(DEPENDENCY, WINRT_MANIFEST.dependencies): \
             MANIFEST_DEPENDENCIES += "  <PackageDependency Name=\"$$DEPENDENCY\" />"
+        *-msvc2013: MANIFEST_DEPENDENCIES += "</Dependencies>"
 
         WINRT_MANIFEST.dependencies = $$join(MANIFEST_DEPENDENCIES, $$INDENT, $$INDENT)
     }
-- 
cgit v1.2.3