forked from qt-creator/qt-creator
Project: Base IDevice on AspectContainer
This is effectively the same approach as taken with ProjectConfiguration. Having the settings separate leads to quite some boilerplate and in the end to parallel IDevice and DeviceSettings hierarchies. The unusual registration of the docker aspects are due to the multiple inheritance, we need to "dynamic" downcast. Change-Id: I50864e2009f4e525d635decf1c9beaad5e6a5f1f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -1313,7 +1313,7 @@ void BuildDeviceKitAspectFactory::addToMacroExpander(Kit *kit, MacroExpander *ex
|
||||
});
|
||||
expander->registerVariable("BuildDevice:Name", Tr::tr("Build device name"), [kit] {
|
||||
const IDevice::ConstPtr device = BuildDeviceKitAspect::device(kit);
|
||||
return device ? device->settings()->displayName() : QString();
|
||||
return device ? device->displayName() : QString();
|
||||
});
|
||||
expander
|
||||
->registerFileVariables("BuildDevice::Root", Tr::tr("Build device root directory"), [kit] {
|
||||
|
||||
Reference in New Issue
Block a user