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

MCU Support: Fix badly resolved merge conflict

Browse Source 
Poorly resolved merge conflict resulted in an inability to run MCU
applications due to required command line arguments missing
from the command line.

Amends: 9e6a2cc2da

Change-Id: I60d5dee4b6d91b6414ba1fe3f1d95214d371ae32
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Andrii Semkiv
2025-02-19 10:17:17 +01:00
parent 842df0568d
commit ae615554a2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/mcusupport/mcubuildstep.cpp
View File

@@ -71,6 +71,12 @@ DeployMcuProcessStep::DeployMcuProcessStep(ProjectExplorer::BuildStepList *bc, I
cmd.setValue(rootPath.pathAppended("/bin/qmlprojectexporter")); cmd.setValue(rootPath.pathAppended("/bin/qmlprojectexporter"));
const Id toolChainConstant = Internal::Constants::KIT_MCUTARGET_TOOLCHAIN_KEY; const Id toolChainConstant = Internal::Constants::KIT_MCUTARGET_TOOLCHAIN_KEY;
arguments
= {ProcessArgs::quoteArg(buildSystem()->projectFilePath().path()),
"--platform",
findKitInformation(kit, "QUL_PLATFORM"),
"--toolchain",
kit->value(toolChainConstant).toString()};
args.setSettingsKey("QmlProject.Mcu.ProcessStep.Arguments"); args.setSettingsKey("QmlProject.Mcu.ProcessStep.Arguments");
args.setDisplayStyle(StringAspect::LineEditDisplay); args.setDisplayStyle(StringAspect::LineEditDisplay);