diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-12 17:27:37 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-12 17:27:37 +0200 |
| commit | e730e2bb8a2c499d135a472364959b1e48c0ad81 (patch) | |
| tree | c276f9c7be5982958aaa3b5e6e727d9098093c79 /src/libs/utils/environment.h | |
| parent | c12cefbb510758839024446e0c6cebf1a8ef8061 (diff) | |
| parent | 77a6b71f72917939f2fd9c5e1915f8b0f5009949 (diff) | |
Merge remote-tracking branch 'gerrit/2.6'
Conflicts:
src/libs/utils/environment.cpp
src/plugins/android/androidtoolchain.cpp
src/plugins/projectexplorer/gcctoolchain.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qtsupport/baseqtversion.cpp
src/shared/proparser/qmakeevaluator.cpp
Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
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 423e4be404c..bfc98c31da5 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -110,8 +110,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; }; |