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

Utils: Fix pathchooser auto-search-in-path for remote cases

Browse Source 
Amends 11a40e02f2.

Environment::searchInPath only works for local setups, the
remote replacement is FilePath::searchOnDevice.

Change-Id: I8a2ba51903d3308ca9198fbf1154779c78e69e63
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-05 13:14:14 +02:00
parent bf93998fb4
commit 8e41a401b0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/pathchooser.cpp
View File

@@ -220,7 +220,9 @@ FilePath PathChooserPrivate::expandedPath(const QString &input) const
switch (m_acceptingKind) { switch (m_acceptingKind) {
case PathChooser::Command: case PathChooser::Command:
case PathChooser::ExistingCommand: { case PathChooser::ExistingCommand: {
const FilePath expanded = m_environment.searchInPath(path.path(), {m_baseDirectory}); FilePaths searchPaths = m_environment.path();
searchPaths.append(m_baseDirectory);
const FilePath expanded = path.searchOnDevice(searchPaths);
return expanded.isEmpty() ? path : expanded; return expanded.isEmpty() ? path : expanded;
} }
case PathChooser::Any: case PathChooser::Any: