diff -rupN --no-dereference qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
--- qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js 2023-12-12 14:40:58.000000000 +0100
+++ qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js 2023-12-13 08:46:32.667872411 +0100
@@ -74,7 +74,13 @@ function configureQt(pkg) {
return;
}
}
- var suffix = FileInfo.executableSuffix();
+ var qtsuffix = "";
+ if (packageName === "Qt5Core") {
+ qtsuffix = "-qt5;
+ } else if (packageName === "Qt6Core") {
+ qtsuffix = "-qt6;
+ }
+ var suffix = qtsuffix + FileInfo.executableSuffix();
var qmakePaths = [FileInfo.joinPaths(binDir, "qmake" + suffix)];
return QmakeProbeConfigure.configure(qmakePaths);
}
diff -rupN --no-dereference qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qmake-probe.js qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qmake-probe.js
--- qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qmake-probe.js 2023-12-12 14:40:58.000000000 +0100
+++ qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qmake-probe.js 2023-12-13 08:46:32.671872392 +0100
@@ -56,16 +56,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 '" + FileInfo.toNativeSeparators(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 '" + FileInfo.toNativeSeparators(candidate) + "'.");
+ filePaths.push(candidate);
+ }
}
}
}