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

fix latest merge from 2.0

Browse Source
This commit is contained in:
hjk
2010-05-27 12:18:20 +02:00
parent b201dcb584
commit 385034722c
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -320,14 +320,8 @@ void MiniTargetWidget::setActiveRunConfiguration()
void MiniTargetWidget::addRunConfiguration(ProjectExplorer::RunConfiguration* rc) void MiniTargetWidget::addRunConfiguration(ProjectExplorer::RunConfiguration* rc)
{ {
connect(rc, SIGNAL(displayNameChanged()), SLOT(updateDisplayName())); Q_UNUSED(rc);
m_runComboBox->addItem(rc->displayName(), QVariant::fromValue(rc)); m_runComboBox->setEnabled(m_target->runConfigurations().count()>1);
m_runComboBox->setItemData(m_runComboBox->findText(rc->displayName()),
rc->displayName(), Qt::ToolTipRole);
if (m_target->activeRunConfiguration() == rc)
m_runComboBox->setCurrentIndex(m_runComboBox->count()-1);
m_runComboBox->setEnabled(m_runComboBox->count()>1);
} }
void MiniTargetWidget::removeRunConfiguration(ProjectExplorer::RunConfiguration* rc) void MiniTargetWidget::removeRunConfiguration(ProjectExplorer::RunConfiguration* rc)
@@ -339,15 +333,8 @@ void MiniTargetWidget::removeRunConfiguration(ProjectExplorer::RunConfiguration*
void MiniTargetWidget::addBuildConfiguration(ProjectExplorer::BuildConfiguration* bc) void MiniTargetWidget::addBuildConfiguration(ProjectExplorer::BuildConfiguration* bc)
{ {
Q_UNUSED(bc); Q_UNUSED(bc);
QTC_ASSERT(m_buildComboBox, return); connect(bc, SIGNAL(displayNameChanged()), SIGNAL(changed()), Qt::UniqueConnection);
connect(bc, SIGNAL(displayNameChanged()), SLOT(updateDisplayName())); m_buildComboBox->setEnabled(m_target->buildConfigurations().count() > 1);
m_buildComboBox->addItem(bc->displayName(), QVariant::fromValue(bc));
m_buildComboBox->setItemData(m_buildComboBox->findText(bc->displayName()),
bc->displayName(), Qt::ToolTipRole);
if (m_target->activeBuildConfiguration() == bc)
m_buildComboBox->setCurrentIndex(m_buildComboBox->count()-1);
m_buildComboBox->setEnabled(m_buildComboBox->count() > 1);
} }
void MiniTargetWidget::removeBuildConfiguration(ProjectExplorer::BuildConfiguration* bc) void MiniTargetWidget::removeBuildConfiguration(ProjectExplorer::BuildConfiguration* bc)