aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <[email protected]>2025-05-24 12:27:07 +0300
committerIvan Komissarov <[email protected]>2025-05-26 11:37:07 +0000
commite54b544adc2af960a59e2c98082c5ab818a684ad (patch)
tree48fc6cc8d9d32fc03c223475eb3d458c339545d7
parentc1adaf51b86af9076e09be62d21727ff37dee8f5 (diff)
Qt: fix msvc mkspecs detection
Change-Id: I5990a3fa7b61178b66a446c2be9ef68eb5cca8eb Reviewed-by: Christian Kandeler <[email protected]>
-rw-r--r--share/qbs/imports/qbs/Probes/qmake-probe.js7
-rw-r--r--share/qbs/imports/qbs/ProviderUtils/provider-utils.js6
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");