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

Utils: Allow additional directories for FilePath::searchInPath

Browse Source 
This mimics Environment::searchInPath().

Change-Id: I8c772ed31c31c74b09c7aa0e4912de8586dd2468
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-06 15:56:30 +02:00
parent d2aa0f4ed9
commit d7062b5b92
7 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/fileutils.cpp
View File

@@ -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