diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-08-24 16:35:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-08-25 07:16:35 +0000 |
| commit | f2da62fd22422539ad919a8252ed078847788f9f (patch) | |
| tree | d97d42fe9d7b362b01e5a9ea50003d573b2ab0a8 | |
| parent | 637fdcc5ba6e20ff1ffe29dde7ca6c56f66f25b7 (diff) | |
Fix exclusion of system directories from (DY)LD_LIBRARY_PATH
We should not only exclude children of system directories, but also the
directories themselves.
Fixes: QTCREATORBUG-29478
Change-Id: I1aa18b2faa03d241b8cc43eb157b5fa49285a12b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| -rw-r--r-- | src/plugins/cmakeprojectmanager/fileapidataextractor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 16b2a5875b..687c653c5c 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -180,10 +180,10 @@ QVector<FolderNode::LocationInfo> extractBacktraceInformation(const BacktraceInf return info; } -static bool isChildOf(const FilePath &path, const QStringList &prefixes) +static bool isChildOf(const FilePath &path, const FilePaths &prefixes) { - for (const QString &prefix : prefixes) - if (path.isChildOf(FilePath::fromString(prefix))) + for (const FilePath &prefix : prefixes) + if (path == prefix || path.isChildOf(prefix)) return true; return false; } |