Merge remote-tracking branch 'origin/10.0'

Conflicts:
	src/shared/qbs

Change-Id: I33e13270c8c15a51b4ce4eaa6b4584041ed124e0
This commit is contained in:
Eike Ziller
2023-03-13 12:30:04 +01:00
62 changed files with 446 additions and 292 deletions

View File

@@ -76,8 +76,6 @@ void updateMCUProjectTree(ProjectExplorer::Project *p)
const FilePath inputsJsonFile = projectBuildFolder / "CMakeFiles" / (targetName + ".dir")
/ "config/input.json";
printMessage("found Input json file " + inputsJsonFile.absoluteFilePath().toString(), true);
if (!inputsJsonFile.exists())
return;