From d56a6aa1240515f5f603a7511d86da75f2c3c4ec Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 2 May 2017 14:19:09 +0200 Subject: [PATCH] winrt: Fix manifest dependencies for VS 2017 VS 2017 still uses vclibs version 14/140 and it also strictly requires the vclibs' publisher to be set in the manifest. As we only support VS 2015 and 2017 the condition for adding additional vclib dependency information can be dropped. Change-Id: I813a9ad976339e347fd8d9283d92282e86b2791b Reviewed-by: Oswald Buddenhagen Reviewed-by: Maurice Kalinowski --- mkspecs/features/winrt/package_manifest.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 8f4a7a6eab6..a00c84948c8 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -63,7 +63,9 @@ VCLIBS = $${VCLIBS}.Debug else: \ 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" + # VS 2017 still uses vclibs 140 + contains(MSVC_VER, "15.0"): VCLIBS = $$replace(VCLIBS, 150, 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 }