From f036b8ba3208bdee93b2d7b2e0bee05aa45d29bc Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 10 Feb 2022 13:14:45 +0100 Subject: winrt appxmanifest: Properly replace VCLibs version for newer MSVC versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Newer versions of MSVC 2019 do not have 16.0, but 16.x as their MSVC_VER. These versions still use vclibs version 140, so we need a more generic way of replacing that string inside appxmanifest. Fixes: QTBUG-82314 Change-Id: I8fbd13c825a001ae7f516305157e9263477c2199 Reviewed-by: Jussi Witick Reviewed-by: Jörg Bornemann --- mkspecs/features/winrt/package_manifest.prf | 3 +-- 1 file changed, 1 insertion(+), 2 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 279971bd65..2abe75f726 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -37,8 +37,7 @@ else: \ VCLIBS = $${VCLIBS} # 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) + contains(MSVC_VER, "1[56]\.[0-9]"): VCLIBS = $$replace(VCLIBS, 1[56][0-9], 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 } -- cgit v1.2.3