diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-08-15 09:34:55 +0300 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-08-16 13:27:49 +0200 |
| commit | 6f32b8e25722a461f9e24e32a8fd94929926bda2 (patch) | |
| tree | a0bf00b90b8f06d82949b51cb1db52d4f4b3a603 /src/plugins/git/gitsettings.cpp | |
| parent | 6f2cc3a32edc8667e520fd841158e772f1d68d17 (diff) | |
| download | qt-creator-6f32b8e25722a461f9e24e32a8fd94929926bda2.tar.gz | |
Git: Append PATH env variable when locating binary
Complements d3f889df7d59ac3f7f7676c569a9828d56e66fe5
Change-Id: I9f0186edb11695d3d1607615ce24f238d77ef46e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/git/gitsettings.cpp')
| -rw-r--r-- | src/plugins/git/gitsettings.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index 6c40c289d8..c4fca8d32d 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -84,9 +84,12 @@ QString GitSettings::gitBinaryPath(bool *ok, QString *errorMessage) const if (m_binaryPath.isEmpty()) { const QString binary = stringValue(binaryPathKey); QString currentPath = stringValue(pathKey); - // Easy, git is assumed to be elsewhere accessible - if (currentPath.isEmpty()) - currentPath = QString::fromLocal8Bit(qgetenv("PATH")); + QString systemPath = QString::fromLocal8Bit(qgetenv("PATH")); + if (!systemPath.isEmpty()) { + if (!currentPath.isEmpty()) + currentPath.append(Utils::SynchronousProcess::pathSeparator()); + currentPath.append(systemPath); + } // Search in path? m_binaryPath = Utils::SynchronousProcess::locateBinary(currentPath, binary); if (m_binaryPath.isEmpty()) { |