Merge remote-tracking branch 'origin/11.0'

Change-Id: I6c2a1d497aae9bda45c4aae47fb0be6c61c1ec29
This commit is contained in:
Eike Ziller
2023-08-23 09:30:32 +02:00
6 changed files with 19 additions and 6 deletions

View File

@@ -162,7 +162,7 @@ FilePath SysRootKitAspect::sysRoot(const Kit *k)
return {};
if (!k->value(SysRootKitAspect::id()).toString().isEmpty())
return FilePath::fromString(k->value(SysRootKitAspect::id()).toString());
return FilePath::fromSettings(k->value(SysRootKitAspect::id()));
for (ToolChain *tc : ToolChainKitAspect::toolChains(k)) {
if (!tc->sysRoot().isEmpty())