From cbbd9cfdfec415a3cc6c2218b39e9c3862dd9b54 Mon Sep 17 00:00:00 2001 From: Andrii Semkiv Date: Fri, 6 Sep 2024 11:44:22 +0200 Subject: BareMetal: Replace FilePath::toString Replace occurrences of FilePath::toString with more sensible alternatives. Change-Id: If628393e56e512e3a8a3e19a048e190809c69bf7 Reviewed-by: hjk --- src/plugins/baremetal/keiltoolchain.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/baremetal/keiltoolchain.cpp') diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 0bc91e7b2fe..44ea4f461fc 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -294,20 +294,20 @@ static HeaderPaths dumpHeaderPaths(const FilePath &compiler) if (!compiler.exists()) return {}; - QDir toolkitDir(compiler.parentDir().toString()); - if (!toolkitDir.cdUp()) + const FilePath toolkitDir = compiler.parentDir().parentDir(); + if (!toolkitDir.exists()) return {}; HeaderPaths headerPaths; const Abi::Architecture arch = guessArchitecture(compiler); if (isMcsArchitecture(arch) || isC166Architecture(arch)) { - QDir includeDir(toolkitDir); - if (includeDir.cd("inc")) + const FilePath includeDir = toolkitDir.pathAppended("inc"); + if (includeDir.exists()) headerPaths.push_back(HeaderPath::makeBuiltIn(includeDir.canonicalPath())); } else if (isArmArchitecture(arch)) { - QDir includeDir(toolkitDir); - if (includeDir.cd("include")) + const FilePath includeDir = toolkitDir.pathAppended("include"); + if (includeDir.exists()) headerPaths.push_back(HeaderPath::makeBuiltIn(includeDir.canonicalPath())); } -- cgit v1.2.3