diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2016-11-22 13:14:53 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-01-20 13:09:16 +0000 |
| commit | d9203fa534f31509e87bb6c6c702c1b7149372e3 (patch) | |
| tree | 5033e8aec1387d28cde8d490717e3a165d3a8aeb /mkspecs/features/winrt | |
| parent | 6b8666c7f24acd13246c51eeee1316dd95ab1860 (diff) | |
winrt: Add support for Visual Studio 2017
Tested with RC
Task-number: QTBUG-57086
Change-Id: I57ecfd0751538dcba41ebaf028de1bc5b4debbb7
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'mkspecs/features/winrt')
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf index f397ef3d61..f79d04ce41 100644 --- a/mkspecs/features/winrt/default_pre.prf +++ b/mkspecs/features/winrt/default_pre.prf @@ -1,4 +1,4 @@ -*msvc2015 { +*msvc2015|*msvc2017 { # Note that the order is important - ucrt(d) has to be first. # Otherwise, the linker might use malloc from a different library, # but free_dbg() from the runtime, causing an assertion failure diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index e7859a7cae..e0e421ed9a 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -94,7 +94,7 @@ 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 { + *-msvc2015|*-msvc2017 { isEmpty(WINRT_MANIFEST.minVersion): WINRT_MANIFEST.minVersion = $$(UCRTVersion) isEmpty(WINRT_MANIFEST.minVersion): error("No UCRTVersion found in environment.")) isEmpty(WINRT_MANIFEST.maxVersionTested): WINRT_MANIFEST.maxVersionTested = $$WINRT_MANIFEST.minVersion @@ -118,7 +118,7 @@ # All Windows 10 applications need to have internetClient. It is also not marked as additional # capability anymore and is assumed to be standard. - *-msvc2015: WINRT_MANIFEST.capabilities += internetClient + *-msvc2015|*-msvc2017: WINRT_MANIFEST.capabilities += internetClient contains(WINRT_MANIFEST.capabilities, defaults) { WINRT_MANIFEST.capabilities -= defaults @@ -145,7 +145,7 @@ } # Dependencies are given as a string list. The CRT dependency is added automatically above. - # For MSVC2015 the dependencies are added in conjunction with TargetDeviceFamily + # For MSVC2015/2017 the dependencies are added in conjunction with TargetDeviceFamily # Due to the hard coded dependency on "Windows.Universal" the <Dependencies> tag # is already inside the MSVC2015 manifest. WINRT_MANIFEST.dependencies = $$unique(WINRT_MANIFEST.dependencies) |