diff -rupN --no-dereference qbs-src-2.1.0/share/qbs/module-providers/Qt/setup-qt.js qbs-src-2.1.0-new/share/qbs/module-providers/Qt/setup-qt.js
--- qbs-src-2.1.0/share/qbs/module-providers/Qt/setup-qt.js 2023-07-20 22:07:27.000000000 +0200
+++ qbs-src-2.1.0-new/share/qbs/module-providers/Qt/setup-qt.js 2023-07-26 22:48:22.275997939 +0200
@@ -57,16 +57,19 @@ function getQmakeFilePaths(qmakeFilePath
var pathValue = Environment.getEnv("PATH");
if (pathValue) {
var dirs = splitNonEmpty(pathValue, FileInfo.pathListSeparator());
- for (var i = 0; i < dirs.length; ++i) {
- var candidate = FileInfo.joinPaths(dirs[i], "qmake" + FileInfo.executableSuffix());
- var canonicalCandidate = FileInfo.canonicalPath(candidate);
- if (!canonicalCandidate || !File.exists(canonicalCandidate))
- continue;
- if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser")
- candidate = canonicalCandidate;
- if (!filePaths.contains(candidate)) {
- console.info("Found Qt at '" + toNative(candidate) + "'.");
- filePaths.push(candidate);
+ var qtvers = ["-qt6", "-qt5", ""];
+ for (var j = 0; j < qtvers.length; ++j) {
+ for (var i = 0; i < dirs.length; ++i) {
+ var candidate = FileInfo.joinPaths(dirs[i], "qmake" + qtvers[j] + FileInfo.executableSuffix());
+ var canonicalCandidate = FileInfo.canonicalPath(candidate);
+ if (!canonicalCandidate || !File.exists(canonicalCandidate))
+ continue;
+ if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser")
+ candidate = canonicalCandidate;
+ if (!filePaths.contains(candidate)) {
+ console.info("Found Qt at '" + toNative(candidate) + "'.");
+ filePaths.push(candidate);
+ }
}
}
}