forked from qt-creator/qt-creator
iOS: Call deviceTypeAspect->update from any update
While triggering unncessarily in some cases now, the function is cheap and moving the call out of the way will allow for removing RunConfiguration::doAdditionalSetup() later. Change-Id: I06961ca43e6e56ebd16bf3c04e8ce0a4478494ba Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -119,12 +119,13 @@ IosRunConfiguration::IosRunConfiguration(Target *target, Core::Id id)
|
|||||||
setDisplayName(tr("Run %1 on %2").arg(applicationName()).arg(devName));
|
setDisplayName(tr("Run %1 on %2").arg(applicationName()).arg(devName));
|
||||||
|
|
||||||
executableAspect->setExecutable(localExecutable());
|
executableAspect->setExecutable(localExecutable());
|
||||||
|
|
||||||
|
m_deviceTypeAspect->updateDeviceType();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void IosDeviceTypeAspect::deviceChanges()
|
void IosDeviceTypeAspect::deviceChanges()
|
||||||
{
|
{
|
||||||
updateDeviceType();
|
|
||||||
m_runConfiguration->update();
|
m_runConfiguration->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -304,7 +305,6 @@ void IosDeviceTypeAspect::setDeviceType(const IosDeviceType &deviceType)
|
|||||||
|
|
||||||
void IosRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
|
void IosRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
|
||||||
{
|
{
|
||||||
m_deviceTypeAspect->updateDeviceType();
|
|
||||||
update();
|
update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user