summaryrefslogtreecommitdiff
path: root/src/plugins/mcusupport/mcusupportsdk.cpp
diff options
context:
space:
mode:
authorYasser Grimes <yasser.grimes@qt.io>2022-10-24 18:50:27 +0300
committerYasser Grimes <yasser.grimes@qt.io>2022-10-28 11:57:37 +0000
commit7938a8a80fae24af1b678a70ea3e84e391243671 (patch)
tree24de78e5b83f330e1b777226e3ec100968e95a59 /src/plugins/mcusupport/mcusupportsdk.cpp
parenta08c49b3217e022252057aa8054c7e467b720719 (diff)
downloadqt-creator-7938a8a80fae24af1b678a70ea3e84e391243671.tar.gz
McuSupport: Store macros as part of McuSdkRepository
To support extending the macros and calling the McuTargetFactory::expandVariables function statically, the macros are added as part of the SdkRepository. This commit also adds helper functions to extend macros other than the ones created from the packages. Change-Id: Ie7d2a9ad626782eec18738bdd3472ffd202e7a36 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/mcusupport/mcusupportsdk.cpp')
-rw-r--r--src/plugins/mcusupport/mcusupportsdk.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index a6959917e6..76f2420679 100644
--- a/src/plugins/mcusupport/mcusupportsdk.cpp
+++ b/src/plugins/mcusupport/mcusupportsdk.cpp
@@ -591,7 +591,11 @@ McuSdkRepository targetsFromDescriptions(const QList<McuTargetDescription> &desc
mcuPackages.insert(package);
}
}
- return McuSdkRepository{mcuTargets, mcuPackages};
+
+ McuSdkRepository repo{mcuTargets, mcuPackages};
+ repo.expandVariables();
+
+ return repo;
}
FilePath kitsPath(const FilePath &qtMcuSdkPath)