Fix version detection for MSVC 2017

The version number for recent MSVC2017 installation has changed to the
format \d+\.\d+\.\d+\.\d+ and the second number is not guaranteed to be
a zero.

Change-Id: I13728d2a5ea3162c3ff29558757cd576a83f4983
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index 3bb99fd22..a6292d860 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -295,7 +295,7 @@ static std::vector<MSVC> installedMSVCs()
         installInfos = installedMSVCsFromRegistry();
     for (const MSVCInstallInfo &installInfo : installInfos) {
         MSVC msvc;
-        msvc.internalVsVersion = Version::fromString(installInfo.version);
+        msvc.internalVsVersion = Version::fromString(installInfo.version, true);
         if (!msvc.internalVsVersion.isValid())
             continue;
 
@@ -307,7 +307,7 @@ static std::vector<MSVC> installedMSVCs()
         }
 
         msvc.version = QString::number(Internal::VisualStudioVersionInfo(
-            Version::fromString(installInfo.version)).marketingVersion());
+            msvc.internalVsVersion).marketingVersion());
         if (msvc.version.isEmpty()) {
             qbsWarning() << Tr::tr("Unknown MSVC version %1 found.").arg(installInfo.version);
             continue;