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

McuSupport: Generate kit name in setKitProperties

Browse Source 
Change-Id: I88a0a2b1291322ad9313eb5d2ad8cafa28f3bfec
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Piotr Mućko
2022-04-25 00:02:44 +02:00
parent 11ce6e365f
commit 080249e902
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/mcusupport/mcukitmanager.cpp
View File

@@ -109,12 +109,10 @@ public:
} }
} }
static void setKitProperties(const QString &kitName, static void setKitProperties(Kit *k, const McuTarget *mcuTarget, const FilePath &sdkPath)
Kit *k,
const McuTarget *mcuTarget,
const FilePath &sdkPath)
{ {
using namespace Constants; using namespace Constants;
const QString kitName{generateKitNameFromTarget(mcuTarget)};
k->setUnexpandedDisplayName(kitName); k->setUnexpandedDisplayName(kitName);
k->setValue(KIT_MCUTARGET_VENDOR_KEY, mcuTarget->platform().vendor); k->setValue(KIT_MCUTARGET_VENDOR_KEY, mcuTarget->platform().vendor);
@@ -129,8 +127,7 @@ public:
if (mcuTarget->toolChainPackage()->isDesktopToolchain()) if (mcuTarget->toolChainPackage()->isDesktopToolchain())
k->setDeviceTypeForIcon(DEVICE_TYPE); k->setDeviceTypeForIcon(DEVICE_TYPE);
k->setValue(QtSupport::SuppliesQtQuickImportPath::id(), true); k->setValue(QtSupport::SuppliesQtQuickImportPath::id(), true);
k->setValue(QtSupport::KitQmlImportPath::id(), k->setValue(QtSupport::KitQmlImportPath::id(), (sdkPath / "include/qul").toVariant());
sdkPath.pathAppended("include/qul").toVariant());
k->setValue(QtSupport::KitHasMergedHeaderPathsWithQmlImportPaths::id(), true); k->setValue(QtSupport::KitHasMergedHeaderPathsWithQmlImportPaths::id(), true);
QSet<Id> irrelevant = { QSet<Id> irrelevant = {
SysRootKitAspect::id(), SysRootKitAspect::id(),
@@ -326,10 +323,7 @@ Kit *newKit(const McuTarget *mcuTarget, const McuPackagePtr &qtForMCUsSdk)
const auto init = [&mcuTarget, qtForMCUsSdk](Kit *k) { const auto init = [&mcuTarget, qtForMCUsSdk](Kit *k) {
KitGuard kitGuard(k); KitGuard kitGuard(k);
McuKitFactory::setKitProperties(generateKitNameFromTarget(mcuTarget), McuKitFactory::setKitProperties(k, mcuTarget, qtForMCUsSdk->path());
k,
mcuTarget,
qtForMCUsSdk->path());
McuKitFactory::setKitDevice(k, mcuTarget); McuKitFactory::setKitDevice(k, mcuTarget);
McuKitFactory::setKitToolchains(k, mcuTarget->toolChainPackage()); McuKitFactory::setKitToolchains(k, mcuTarget->toolChainPackage());
McuKitFactory::setKitDebugger(k, mcuTarget->toolChainPackage()); McuKitFactory::setKitDebugger(k, mcuTarget->toolChainPackage());
@@ -375,10 +369,10 @@ QVersionNumber kitQulVersion(const Kit *kit)
} }
// Kit Information // Kit Information
static FilePath kitDependencyPath(const Kit *kit, const QString &variableName) static FilePath kitDependencyPath(const Kit *kit, const QString &cmakeVariableName)
{ {
const auto config = CMakeConfigurationKitAspect::configuration(kit).toList(); const auto config = CMakeConfigurationKitAspect::configuration(kit).toList();
const auto keyName = variableName.toUtf8(); const auto keyName = cmakeVariableName.toUtf8();
for (const CMakeConfigItem &configItem : config) { for (const CMakeConfigItem &configItem : config) {
if (configItem.key == keyName) if (configItem.key == keyName)
return FilePath::fromUserInput(QString::fromUtf8(configItem.value)); return FilePath::fromUserInput(QString::fromUtf8(configItem.value));
@@ -566,10 +560,7 @@ void upgradeKitInPlace(ProjectExplorer::Kit *kit,
const McuTarget *mcuTarget, const McuTarget *mcuTarget,
const McuPackagePtr &qtForMCUsSdk) const McuPackagePtr &qtForMCUsSdk)
{ {
McuKitFactory::setKitProperties(generateKitNameFromTarget(mcuTarget), McuKitFactory::setKitProperties(kit, mcuTarget, qtForMCUsSdk->path());
kit,
mcuTarget,
qtForMCUsSdk->path());
McuKitFactory::setKitEnvironment(kit, mcuTarget, qtForMCUsSdk); McuKitFactory::setKitEnvironment(kit, mcuTarget, qtForMCUsSdk);
McuKitFactory::setKitCMakeOptions(kit, mcuTarget, qtForMCUsSdk); McuKitFactory::setKitCMakeOptions(kit, mcuTarget, qtForMCUsSdk);
McuKitFactory::setKitDependencies(kit, mcuTarget, qtForMCUsSdk); McuKitFactory::setKitDependencies(kit, mcuTarget, qtForMCUsSdk);