From ae615554a22d02cc3113f8f983cbe9e605969648 Mon Sep 17 00:00:00 2001 From: Andrii Semkiv Date: Wed, 19 Feb 2025 10:17:17 +0100 Subject: [PATCH] MCU Support: Fix badly resolved merge conflict Poorly resolved merge conflict resulted in an inability to run MCU applications due to required command line arguments missing from the command line. Amends: 9e6a2cc2daef0d99b17c53e5e9dbb2d12d157d36 Change-Id: I60d5dee4b6d91b6414ba1fe3f1d95214d371ae32 Reviewed-by: Thomas Hartmann --- src/plugins/mcusupport/mcubuildstep.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/mcusupport/mcubuildstep.cpp b/src/plugins/mcusupport/mcubuildstep.cpp index 0a9145e8368..83756879c71 100644 --- a/src/plugins/mcusupport/mcubuildstep.cpp +++ b/src/plugins/mcusupport/mcubuildstep.cpp @@ -71,6 +71,12 @@ DeployMcuProcessStep::DeployMcuProcessStep(ProjectExplorer::BuildStepList *bc, I cmd.setValue(rootPath.pathAppended("/bin/qmlprojectexporter")); 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.setDisplayStyle(StringAspect::LineEditDisplay);