whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

winrt: Fix manifest creation for Visual Studio 2019 

- 2019 still uses VCLIB version 140
- minVersion and maxVersionTested have to be set for every MSVC version

Change-Id: I9300e03115e2e99fd250ec85bdd7f3367ab00d48
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
bb10
Oliver Wolff 2020-04-20 13:24:50 +02:00
parent 864f18ba2f
commit 47eba45990
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mkspecs/features/winrt/package_manifest.prf
View File

@ -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) "