feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Take Prepend to PATH into account again, take #2

Browse Source 
Amends b5a4d38022, which uses FilePath::searchInPath
which does not exist in 5.0.

Task-number: QTCREATORBUG-26329
Change-Id: I94ac35cc95a47e4f82c6205ad24d8bdc69ddf1af
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2021-09-29 14:31:31 +02:00
parent faba85a2c3
commit 67c0104b8e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gitsettings.cpp
View File

@@ -142,10 +142,10 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const
FilePath binPath = binaryPath.filePath();
if (!binPath.isAbsolutePath()) {
FilePaths searchPath = binPath.deviceEnvironment().path();
Environment env = Environment::systemEnvironment();
if (!path.filePath().isEmpty())
searchPath.prepend(path.filePath());
binPath = binPath.searchInPath(searchPath);
env.prependOrSetPath(path.filePath().toString());
binPath = env.searchInPath(binPath.toString());
}
if (binPath.isEmpty()) {
if (ok)