diff options
| author | hjk <hjk@qt.io> | 2021-08-17 14:49:19 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-08-23 11:56:24 +0000 |
| commit | 57a90b019fbede5fdc1ffcfebf2e9a929d46318a (patch) | |
| tree | 7579895a8a321124e1918de0fdd23526f413bd15 /src/libs/utils/archive.cpp | |
| parent | 59c0e5480abbf0cd4d343ef94fa2e16b9d86c0b6 (diff) | |
Utils: Introduce a FilePath::searchInPath() convenience function
Diverts to searchInDirectory(). Use it in some places.
Change-Id: I9e5642f0ae0ed4dd9fb9f34bcaa11a25bd26c690
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/utils/archive.cpp')
| -rw-r--r-- | src/libs/utils/archive.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp index 66a419fdbb8..2bbc8eb9eb8 100644 --- a/src/libs/utils/archive.cpp +++ b/src/libs/utils/archive.cpp @@ -118,8 +118,8 @@ static QVector<Tool> toolsForFilePath(const FilePath &fp) static Utils::optional<Tool> resolveTool(const Tool &tool) { - const FilePaths dirs = Environment::systemEnvironment().path() + tool.additionalSearchDirs; - const FilePath executable = tool.command.executable().withExecutableSuffix().searchInDirectories(dirs); + const FilePath executable = + tool.command.executable().withExecutableSuffix().searchInPath(tool.additionalSearchDirs); Tool resolvedTool = tool; resolvedTool.command.setExecutable(executable); return executable.isEmpty() ? Utils::nullopt : Utils::make_optional(resolvedTool); |