Qt provider: Make sure not to invoke qtchooser directly

In some Linux distributions, qmake is a soft link to qtchooser, which
only behaves like qmake if invoked via that name.

Change-Id: I6705a81f6a4dfdda5fd3f1e16a63318a4b772084
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 7 insertions, 2 deletions

diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
index 030c3286b..236b4dea4 100644
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -59,8 +59,13 @@ function getQmakeFilePaths(qmakeFilePaths, qbs) {
     var suffix = exeSuffix(qbs);
     var filePaths = [];
     for (var i = 0; i < dirs.length; ++i) {
-        var candidate = FileInfo.canonicalPath(FileInfo.joinPaths(dirs[i], "qmake" + suffix));
-        if (candidate && File.exists(candidate) && !filePaths.contains(candidate)) {
+        var candidate = FileInfo.joinPaths(dirs[i], "qmake" + suffix);
+        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);
         }