From 2713f080bb34a2513dc5585a209bdc95ab815e45 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 10 Nov 2016 09:40:09 +0100 Subject: Remove wondrous VS version detection logic Replace which_dotnet_version with a simple function that converts the value of MSVC_VER to its corresponding enum value in the VS project generator. This reduces the maintenance burden when adding support for a new VS version, because we do not need to update the registry keys in which_dotnet_version anymore. The which_dotnet_version function implemented the following logic: - find all installed VS versions via registry - select the "best matching one" - if there is no best match, select the VS that's in PATH - create a project for that VS installation The usefulness of this whole stunt is questionable as the VS version of Qt's mkspec must match the version of a project using that Qt anyway. Change-Id: I9fb9a099ee5ddb5fc4c450be4f68f41f2b406b9a Reviewed-by: Oswald Buddenhagen Reviewed-by: Oliver Wolff Reviewed-by: Joerg Bornemann --- qmake/generators/win32/msvc_objectmodel.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qmake/generators/win32/msvc_objectmodel.h') diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 94256f2103..64c6e9098d 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -54,6 +54,8 @@ enum DotNET { NET2015 = 0xd0 }; +DotNET vsVersionFromString(const ProString &versionString); + /* This Object model is of course VERY simplyfied, and does not actually follow the original MSVC -- cgit v1.2.3