From d7b847112a3ad9a743fd27752aa046759352f7bc Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 6 Aug 2015 15:13:58 +0200 Subject: WinRT: Fix Visual Studio 2015 project generation - ApplicationTypeRevision has been updated to 10.0 in the final VS2015 release - For Universal App project one needs to specify WindowsTargetPlatformVersion and WindowsTargetPlatformMinVersion - Disable adding Qt libraries to the DeploymentFiles variable for Universal Apps. Before an error occurred during build as windeployqt asked to package the very same files. However, windeployqt also takes care of plugins and hence we prefer to rely on windeployqt and disable the link step parsing. Change-Id: I5180519cabde60dbc7786ef27a6fbe0ef2ac44f3 Reviewed-by: Andrew Knight --- qmake/generators/win32/msbuild_objectmodel.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'qmake/generators/win32/msbuild_objectmodel.cpp') diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index cbf7cf26dc..aad6e6e878 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -643,7 +643,12 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) << tagValue("DefaultLanguage", "en") << tagValue("AppContainerApplication", "true") << tagValue("ApplicationType", isWinPhone ? "Windows Phone" : "Windows Store") - << tagValue("ApplicationTypeRevision", tool.SdkVersion == "10.0" ? "8.2" : tool.SdkVersion); + << tagValue("ApplicationTypeRevision", tool.SdkVersion); + if (tool.SdkVersion == "10.0") { + const QString ucrtVersion = qgetenv("UCRTVERSION"); + xml << tagValue("WindowsTargetPlatformVersion", ucrtVersion) + << tagValue("WindowsTargetPlatformMinVersion", ucrtVersion); + } } xml << closetag(); -- cgit v1.2.3