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

Utils: Add PathFilter to FilePath::searchInPath

Browse Source 
Change-Id: Iccbecc7401f17208487113f89e49ed7103acf9d6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-02-09 08:18:12 +01:00
parent f6d1a4aaf4
commit 1523f49e5c
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/filepath.cpp
View File

@@ -1305,14 +1305,16 @@ FilePath FilePath::withNewPath(const QString &newPath) const
assert(fullPath == FilePath::fromUrl("docker://123/usr/bin/make"))
\endcode
*/
FilePath FilePath::searchInDirectories(const FilePaths &dirs) const
FilePath FilePath::searchInDirectories(const FilePaths &dirs, const PathFilter &filter) const
{
if (isAbsolutePath())
return *this;
return deviceEnvironment().searchInDirectories(path(), dirs);
return deviceEnvironment().searchInDirectories(path(), dirs, filter);
}
FilePath FilePath::searchInPath(const FilePaths &additionalDirs, PathAmending amending) const
FilePath FilePath::searchInPath(const FilePaths &additionalDirs,
PathAmending amending,
const PathFilter &filter) const
{
if (isAbsolutePath())
return *this;
@@ -1328,7 +1330,7 @@ FilePath FilePath::searchInPath(const FilePaths &additionalDirs, PathAmending am
else
directories = additionalDirs + directories;
}
return searchInDirectories(directories);
return searchInDirectories(directories, filter);
}
Environment FilePath::deviceEnvironment() const