diff options
author | hjk <[email protected]> | 2021-07-06 15:56:30 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2021-07-07 10:43:46 +0000 |
commit | d7062b5b92b90fac184574eb59adba40044732e4 (patch) | |
tree | 390743ae44c0d51e9e08f935e399ce1a5655030c /src/libs/utils/fileutils.cpp | |
parent | d2aa0f4ed9cd721b2658550e69ea3059d8f70f77 (diff) |
Utils: Allow additional directories for FilePath::searchInPath
This mimics Environment::searchInPath().
Change-Id: I8c772ed31c31c74b09c7aa0e4912de8586dd2468
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/libs/utils/fileutils.cpp')
-rw-r--r-- | src/libs/utils/fileutils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index a4704bf696d..c739b74ec31 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -1378,13 +1378,13 @@ FilePath FilePath::onDevice(const FilePath &deviceTemplate) const assert(fullPath == FilePath::fromUrl("docker://123/usr/bin/make")) \endcode */ -FilePath FilePath::onDeviceSearchInPath() const +FilePath FilePath::onDeviceSearchInPath(const FilePaths &additionalDirs) const { if (needsDevice()) { QTC_ASSERT(s_deviceHooks.searchInPath, return {}); - return s_deviceHooks.searchInPath(*this); + return s_deviceHooks.searchInPath(*this, additionalDirs); } - return Environment::systemEnvironment().searchInPath(path()); + return Environment::systemEnvironment().searchInPath(path(), additionalDirs); } Environment FilePath::deviceEnvironment() const |