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

ProjectExplorer: Add device root path macro

Browse Source 
Change-Id: Ie2a046c71194d2af20fb8483440bd0ffa22fda0f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-04-04 10:13:03 +02:00
parent 36463f3c87
commit 27fbe0c51d
1 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/plugins/projectexplorer/kitinformation.cpp
View File

@@ -1023,30 +1023,29 @@ KitAspect::ItemList DeviceKitAspect::toUserOutput(const Kit *k) const
void DeviceKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const void DeviceKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const
{ {
QTC_ASSERT(kit, return); QTC_ASSERT(kit, return);
expander->registerVariable("Device:HostAddress", Tr::tr("Host address"), expander->registerVariable("Device:HostAddress", Tr::tr("Host address"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().host() : QString();
return device ? device->sshParameters().host() : QString();
}); });
expander->registerVariable("Device:SshPort", Tr::tr("SSH port"), expander->registerVariable("Device:SshPort", Tr::tr("SSH port"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? QString::number(device->sshParameters().port()) : QString();
return device ? QString::number(device->sshParameters().port()) : QString();
}); });
expander->registerVariable("Device:UserName", Tr::tr("User name"), expander->registerVariable("Device:UserName", Tr::tr("User name"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().userName() : QString();
return device ? device->sshParameters().userName() : QString();
}); });
expander->registerVariable("Device:KeyFile", Tr::tr("Private key file"), expander->registerVariable("Device:KeyFile", Tr::tr("Private key file"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->sshParameters().privateKeyFile.toString() : QString();
return device ? device->sshParameters().privateKeyFile.toString() : QString();
}); });
expander->registerVariable("Device:Name", Tr::tr("Device name"), expander->registerVariable("Device:Name", Tr::tr("Device name"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
const IDevice::ConstPtr device = DeviceKitAspect::device(kit); return device ? device->displayName() : QString();
return device ? device->displayName() : QString(); });
expander->registerFileVariables("Device::Root", Tr::tr("Device root directory"), [kit] {
const IDevice::ConstPtr device = DeviceKitAspect::device(kit);
return device ? device->rootPath() : FilePath{};
}); });
} }
@@ -1266,31 +1265,31 @@ KitAspect::ItemList BuildDeviceKitAspect::toUserOutput(const Kit *k) const
void BuildDeviceKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const void BuildDeviceKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) const
{ {
QTC_ASSERT(kit, return); QTC_ASSERT(kit, return);
expander->registerVariable("BuildDevice:HostAddress", Tr::tr("Build host address"), expander->registerVariable("BuildDevice:HostAddress", Tr::tr("Build host address"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit); return device ? device->sshParameters().host() : QString();
return device ? device->sshParameters().host() : QString();
}); });
expander->registerVariable("BuildDevice:SshPort", Tr::tr("Build SSH port"), expander->registerVariable("BuildDevice:SshPort", Tr::tr("Build SSH port"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit); return device ? QString::number(device->sshParameters().port()) : QString();
return device ? QString::number(device->sshParameters().port()) : QString();
}); });
expander->registerVariable("BuildDevice:UserName", Tr::tr("Build user name"), expander->registerVariable("BuildDevice:UserName", Tr::tr("Build user name"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit); return device ? device->sshParameters().userName() : QString();
return device ? device->sshParameters().userName() : QString();
}); });
expander->registerVariable("BuildDevice:KeyFile", Tr::tr("Build private key file"), expander->registerVariable("BuildDevice:KeyFile", Tr::tr("Build private key file"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit); return device ? device->sshParameters().privateKeyFile.toString() : QString();
return device ? device->sshParameters().privateKeyFile.toString() : QString();
}); });
expander->registerVariable("BuildDevice:Name", Tr::tr("Build device name"), expander->registerVariable("BuildDevice:Name", Tr::tr("Build device name"), [kit] {
[kit]() -> QString { const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit); return device ? device->displayName() : QString();
return device ? device->displayName() : QString();
}); });
expander
->registerFileVariables("BuildDevice::Root", Tr::tr("Build device root directory"), [kit] {
const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
return device ? device->rootPath() : FilePath{};
});
} }
Id BuildDeviceKitAspect::id() Id BuildDeviceKitAspect::id()