Qt: warn if no qmakes were found

Task-number: QBS-1672
Change-Id: I0a7afc453a484b7467d2eb0d049685bea373c199
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 20 insertions, 15 deletions

diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
index b1239a78a..422863b95 100644
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -53,24 +53,29 @@ function getQmakeFilePaths(qmakeFilePaths, qbs) {
     if (qmakeFilePaths && qmakeFilePaths.length > 0)
         return qmakeFilePaths;
     console.info("Detecting Qt installations...");
-    var pathValue = Environment.getEnv("PATH");
-    if (!pathValue)
-        return [];
-    var dirs = splitNonEmpty(pathValue, qbs.pathListSeparator);
-    var suffix = exeSuffix(qbs);
     var filePaths = [];
-    for (var i = 0; i < dirs.length; ++i) {
-        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);
+    var pathValue = Environment.getEnv("PATH");
+    if (pathValue) {
+        var dirs = splitNonEmpty(pathValue, qbs.pathListSeparator);
+        var suffix = exeSuffix(qbs);
+        for (var i = 0; i < dirs.length; ++i) {
+            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);
+            }
         }
     }
+    if (filePaths.length === 0) {
+        console.warn("Could not find any qmake executables in PATH. Either make sure a qmake "
+        + "executable is present in PATH or set the moduleProviders.Qt.qmakeFilePaths property "
+        + "to point a qmake executable.");
+    }
     return filePaths;
 }