androiddeployqt: Don't detect directories as executable files

When looking for an executable on the PATH we would mistakenly
report directories with the same filename (like "ant") as
the correct executable.

Task-number: QTBUG-33907
Change-Id: I7122e6f8da7a3027666e9dfc3040a17c2876e981
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 7ad97ac..bea1da0 100644 (file)
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -1518,7 +1518,8 @@ QString findInPath(const QString &fileName)
 
     QStringList paths = path.split(separator);
     foreach (QString path, paths) {
-        if (QFile::exists(path + QLatin1Char('/') + fileName))
+        QFileInfo fileInfo(path + QLatin1Char('/') + fileName);
+        if (fileInfo.exists() && fileInfo.isFile() && fileInfo.isExecutable())
             return path + QLatin1Char('/') + fileName;
     }