Merge 1.13 into master

Change-Id: I0678ef8cf6f81489914e79be903ca4d4c1cebada

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 22952716a..faacb4d09 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -296,7 +296,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;
 
@@ -308,7 +308,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;