2 files changed, 9 insertions, 4 deletions
diff --git a/share/qbs/imports/qbs/Probes/qmake-probe.js b/share/qbs/imports/qbs/Probes/qmake-probe.js
index 94a5a8b12..bdb930460 100644
--- a/share/qbs/imports/qbs/Probes/qmake-probe.js
+++ b/share/qbs/imports/qbs/Probes/qmake-probe.js
@@ -157,8 +157,13 @@ function msvcCompilerVersionForYear(year) {
     return mapping[year];
 }
 
+function msvcPrefix() { return "win32-msvc"; }
+
 function msvcCompilerVersionFromMkspecName(mkspecName) {
-    return msvcCompilerVersionForYear(mkspecName.slice(msvcPrefix().length));
+    if (mkspecName.startsWith(msvcPrefix())) {
+        return msvcCompilerVersionForYear(mkspecName.slice(msvcPrefix().length));
+    }
+    return undefined;
 }
 
 function addQtBuildVariant(qtProps, buildVariantName) {
diff --git a/share/qbs/imports/qbs/ProviderUtils/provider-utils.js b/share/qbs/imports/qbs/ProviderUtils/provider-utils.js
index 963723ae2..e96fb15e8 100644
--- a/share/qbs/imports/qbs/ProviderUtils/provider-utils.js
+++ b/share/qbs/imports/qbs/ProviderUtils/provider-utils.js
@@ -35,9 +35,9 @@ function pkgConfigToModuleName(packageName) {
     return packageName.replace(/\./g, '-');
 }
 
-function msvcPrefix() { return "win32-msvc"; }
-
-function isMsvcQt(qtProps) { return qtProps.mkspecName.startsWith(msvcPrefix()); }
+function isMsvcQt(qtProps) {
+    return qtProps.mkspecName.contains("-msvc");
+}
 
 function isMinGwQt(qtProps) {
     return qtProps.mkspecName.startsWith("win32-g++") || qtProps.mkspecName.startsWith("mingw");