From b9aac89961f83fd572edc223ebd428f51e9365dd Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 18 Jan 2023 08:09:16 +0100 Subject: [PATCH] BareMetal: Adapt to change in FilePath Change-Id: I4766ccd8fc7121af1045d2fc7d2e730da0a9d44b Reviewed-by: hjk --- src/plugins/baremetal/iarewtoolchain.cpp | 2 +- src/plugins/baremetal/keiltoolchain.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 412287216de..80b5491ddff 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -462,7 +462,7 @@ Toolchains IarToolChainFactory::autoDetect(const ToolchainDetector &detector) co if (!compilerPath.isEmpty()) { // Build full compiler path. compilerPath += entry.subExePath; - const FilePath fn = FilePath::fromString(compilerPath); + const FilePath fn = FilePath::fromUserInput(compilerPath); if (compilerExists(fn)) { // Note: threeLevelKey is a guessed toolchain version. candidates.push_back({fn, threeLevelKey}); diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 4c5b3856921..4c023ce3060 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -596,8 +596,8 @@ Toolchains KeilToolChainFactory::autoDetect(const ToolchainDetector &detector) c if (!productKey.startsWith("App")) continue; registry.beginGroup(productKey); - const FilePath productPath(FilePath::fromString(registry.value("ProductDir") - .toString())); + const FilePath productPath(FilePath::fromUserInput(registry.value("ProductDir") + .toString())); // Fetch the toolchain executable path. FilePath compilerPath; if (productPath.endsWith("ARM"))