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

BareMetal: Adapt to change in FilePath

Browse Source 
Change-Id: I4766ccd8fc7121af1045d2fc7d2e730da0a9d44b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2023-01-18 08:09:16 +01:00
parent 17b20e0622
commit b9aac89961
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/baremetal/iarewtoolchain.cpp
View File

@@ -462,7 +462,7 @@ Toolchains IarToolChainFactory::autoDetect(const ToolchainDetector &detector) co
if (!compilerPath.isEmpty()) { if (!compilerPath.isEmpty()) {
// Build full compiler path. // Build full compiler path.
compilerPath += entry.subExePath; compilerPath += entry.subExePath;
const FilePath fn = FilePath::fromString(compilerPath); const FilePath fn = FilePath::fromUserInput(compilerPath);
if (compilerExists(fn)) { if (compilerExists(fn)) {
// Note: threeLevelKey is a guessed toolchain version. // Note: threeLevelKey is a guessed toolchain version.
candidates.push_back({fn, threeLevelKey}); candidates.push_back({fn, threeLevelKey});

2
src/plugins/baremetal/keiltoolchain.cpp
View File

@@ -596,7 +596,7 @@ Toolchains KeilToolChainFactory::autoDetect(const ToolchainDetector &detector) c
if (!productKey.startsWith("App")) if (!productKey.startsWith("App"))
continue; continue;
registry.beginGroup(productKey); registry.beginGroup(productKey);
const FilePath productPath(FilePath::fromString(registry.value("ProductDir") const FilePath productPath(FilePath::fromUserInput(registry.value("ProductDir")
.toString())); .toString()));
// Fetch the toolchain executable path. // Fetch the toolchain executable path.
FilePath compilerPath; FilePath compilerPath;