forked from qt-creator/qt-creator
Profile introduction
Introduce Profiles to store sets of values that describe a system/device. These profiles are held by a target, getting rid of much of the information stored in the Build-/Run-/DeployConfigurations, greatly simplifying those. This is a squash of the wip/profile branch which has been on gerrit for a while, rebased to current master. Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
@@ -292,6 +292,7 @@ void RunSettingsWidget::addRunConfiguration()
|
||||
RunConfiguration *newRC = fai.factory->create(m_target, fai.id);
|
||||
if (!newRC)
|
||||
return;
|
||||
QTC_CHECK(newRC->id() == fai.id);
|
||||
m_target->addRunConfiguration(newRC);
|
||||
m_target->setActiveRunConfiguration(newRC);
|
||||
m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1);
|
||||
@@ -370,9 +371,12 @@ void RunSettingsWidget::currentDeployConfigurationChanged(int index)
|
||||
void RunSettingsWidget::aboutToShowDeployMenu()
|
||||
{
|
||||
m_addDeployMenu->clear();
|
||||
QList<Core::Id> ids = m_target->availableDeployConfigurationIds();
|
||||
DeployConfigurationFactory *factory = DeployConfigurationFactory::find(m_target);
|
||||
if (!factory)
|
||||
return;
|
||||
QList<Core::Id> ids = factory->availableCreationIds(m_target);
|
||||
foreach (Core::Id id, ids) {
|
||||
QAction *action = m_addDeployMenu->addAction(m_target->displayNameForDeployConfigurationId(id));
|
||||
QAction *action = m_addDeployMenu->addAction(factory->displayNameForId(id));
|
||||
action->setData(QVariant::fromValue(id));
|
||||
connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(addDeployConfiguration()));
|
||||
@@ -385,9 +389,18 @@ void RunSettingsWidget::addDeployConfiguration()
|
||||
if (!act)
|
||||
return;
|
||||
Core::Id id = act->data().value<Core::Id>();
|
||||
DeployConfiguration *newDc = m_target->createDeployConfiguration(id);
|
||||
DeployConfigurationFactory *factory = DeployConfigurationFactory::find(m_target);
|
||||
if (!factory)
|
||||
return;
|
||||
DeployConfiguration *newDc = 0;
|
||||
foreach (Core::Id id, factory->availableCreationIds(m_target)) {
|
||||
if (!factory->canCreate(m_target, id))
|
||||
continue;
|
||||
newDc = factory->create(m_target, id);
|
||||
}
|
||||
if (!newDc)
|
||||
return;
|
||||
QTC_CHECK(!newDc || newDc->id() == id);
|
||||
m_target->addDeployConfiguration(newDc);
|
||||
m_target->setActiveDeployConfiguration(newDc);
|
||||
m_removeDeployToolButton->setEnabled(m_target->deployConfigurations().size() > 1);
|
||||
|
||||
Reference in New Issue
Block a user