From f2da62fd22422539ad919a8252ed078847788f9f Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 24 Aug 2023 16:35:51 +0200 Subject: [PATCH] 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 Reviewed-by: --- src/plugins/cmakeprojectmanager/fileapidataextractor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 16b2a5875bf..687c653c5ce 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -180,10 +180,10 @@ QVector 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; }