diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-02 14:19:09 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-03 06:52:27 +0000 |
| commit | d56a6aa1240515f5f603a7511d86da75f2c3c4ec (patch) | |
| tree | 66f492f1295a5691da011c488c33bf15a80bdfd9 /mkspecs | |
| parent | 124b9a6ff89da8be83a256135ec6c4d0603e9a6f (diff) | |
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 <oswald.buddenhagen@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 8f4a7a6eab..a00c84948c 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 } |