From 47eba459905ef884931aa1247c847f7a98a77b28 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 20 Apr 2020 13:24:50 +0200 Subject: winrt: Fix manifest creation for Visual Studio 2019 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 2019 still uses VCLIB version 140 - minVersion and maxVersionTested have to be set for every MSVC version Change-Id: I9300e03115e2e99fd250ec85bdd7f3367ab00d48 Reviewed-by: Friedemann Kleint Reviewed-by: André de la Rocha Reviewed-by: Miguel Costa --- mkspecs/features/winrt/package_manifest.prf | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'mkspecs/features/winrt/package_manifest.prf') 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) " -- cgit v1.2.3