comparison common.cpp @ 77:b522aaa2c053

* Further minor win32 fix

 #include "debug.h"
 
 #include <QFileInfo>
 #include <QProcessEnvironment>
 #include <QStringList>
+#include <QDir>
 
 #include <sys/types.h>
 
 #ifdef Q_OS_WIN32
 #define _WIN32_WINNT 0x0500

 #include <pwd.h>
 #endif
 
 QString findExecutable(QString name)
 {
+    bool found = false;
     if (name != "") {
         if (name[0] != '/') {
+#ifdef Q_OS_WIN32
+            QChar pathSep = ';';
+#else
+            QChar pathSep = ':';
+#endif
             name = QFileInfo(name).fileName();
             QString path =
                 QProcessEnvironment::systemEnvironment().value("PATH");
             DEBUG << "findExecutable: seeking location for binary " << name
                   << ": system path is " << path << endl;
 #ifndef Q_OS_WIN32
             path = path + ":/usr/local/bin";
             DEBUG << "... adding /usr/local/bin just in case (fix and add settings dlg please)"
                     << endl;
 #endif
-#ifdef Q_OS_WIN32
-            QChar pathSep = ';';
-#else
-            QChar pathSep = ':';
-#endif
             QStringList elements = path.split(pathSep, QString::SkipEmptyParts);
             foreach (QString element, elements) {
-                QString full = QString("%1/%2").arg(element).arg(name);
+                QString full = QDir(element).filePath(name);
                 QFileInfo fi(full);
                 if (fi.exists() && fi.isFile() && fi.isExecutable()) {
                     name = full;
+                    found = true;
                     break;
                 }
             }
         }
     }
+#ifdef Q_OS_WIN32
+    if (!found) {
+        if (!name.endsWith(".exe")) {
+            return findExecutable(name + ".exe");
+        }
+    }
+#endif
     return name;
 }
     
 QString getSystem()
 {