diff options
| author | Rainer Keller <Rainer.Keller@qt.io> | 2022-10-18 13:41:13 +0200 |
|---|---|---|
| committer | Rainer Keller <Rainer.Keller@qt.io> | 2022-10-24 11:01:05 +0000 |
| commit | 9566124cad179d4aa0f4ea6e549e2d6eeadb42ba (patch) | |
| tree | 17e3ddfcfadcfe38831c81bd7695aa35861df8c6 | |
| parent | 1db2a10b73fdd60caff71f30c0679a4c7191c03c (diff) | |
McuSupport: Evaluate macros in paths when applying settings
A macro entered by a user was not evaluated. Only the initial strings where
expanded when the targets are created on first start.
Task-number: UL-6697
Change-Id: I642bb4bc41e116cd0fe7f002da3d7f3cb301e62d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| -rw-r--r-- | src/plugins/mcusupport/mcusupportoptionspage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index fd166245a7f..c493952f4fc 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -8,6 +8,7 @@ #include "mcusupportoptions.h" #include "mcusupportsdk.h" #include "mcutarget.h" +#include "mcutargetfactory.h" #include "settingshandler.h" #include <cmakeprojectmanager/cmakeprojectconstants.h> @@ -286,6 +287,7 @@ void McuSupportOptionsWidget::apply() bool pathsChanged = false; m_settingsHandler->setAutomaticKitCreation(m_options.automaticKitCreationEnabled()); + McuTargetFactory::expandVariables(m_options.sdkRepository.packages); pathsChanged |= m_options.qtForMCUsSdkPackage->writeToSettings(); for (const auto &package : std::as_const(m_options.sdkRepository.packages)) pathsChanged |= package->writeToSettings(); |