diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2012-09-11 13:56:08 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@nokia.com> | 2012-09-11 16:02:24 +0200 |
| commit | d02d67d58c5fc8ade5a09deb31dee042275ba6bf (patch) | |
| tree | ece23115b0ca11c66ec4069b8488959b4e1654ab /src/libs/utils/environment.h | |
| parent | c68c96fd231590fe8f8a71540092a8f8fa56ff79 (diff) | |
Fix searchInPath in various ways
Search in path order not in extension order. That is prefer exec.bat to
exec.exe if exec.bat is earlier in the path.
On Windows only append extensions if the executable has none. (That's
how the shell works.)
Change-Id: I4774f47e5d8e71efccbce49f3facc360eb2a193e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/libs/utils/environment.h')
| -rw-r--r-- | src/libs/utils/environment.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index ff491c264b1..1e9e7c045d8 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -108,8 +108,7 @@ public: bool operator==(const Environment &other) const; private: - QString searchInPath(const QStringList &executables, - const QStringList &additionalDirs = QStringList()) const; + QString searchInDirectory(const QStringList &execs, QString directory) const; QMap<QString, QString> m_values; }; |