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

ToolChain: Remove invalid toolchain when not needed

Browse Source 
Remove the invalid toolchain from the combobox when it is no longer needed.
This commit is contained in:
Tobias Hunger
2011-04-14 14:48:14 +02:00
parent 7752a95e15
commit 90a02875cf
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -458,6 +458,7 @@ void Qt4ProjectConfigWidget::toolChainChanged()
{ {
if (m_ignoreChange) if (m_ignoreChange)
return; return;
bool foundTc = false;
for (int i = 0; i < m_ui->toolChainComboBox->count(); ++i) { for (int i = 0; i < m_ui->toolChainComboBox->count(); ++i) {
ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChain *tc =
static_cast<ProjectExplorer::ToolChain *>(m_ui->toolChainComboBox->itemData(i, Qt::UserRole).value<void *>()); static_cast<ProjectExplorer::ToolChain *>(m_ui->toolChainComboBox->itemData(i, Qt::UserRole).value<void *>());
@@ -465,13 +466,20 @@ void Qt4ProjectConfigWidget::toolChainChanged()
m_ignoreChange = true; m_ignoreChange = true;
m_ui->toolChainComboBox->setCurrentIndex(i); m_ui->toolChainComboBox->setCurrentIndex(i);
m_ignoreChange = false; m_ignoreChange = false;
return; foundTc = true;
break;
} }
} }
m_ignoreChange = true; if (foundTc) {
m_ui->toolChainComboBox->addItem(tr("<No tool chain selected>"), qVariantFromValue(static_cast<void *>(0))); int index = m_ui->toolChainComboBox->findData(qVariantFromValue(static_cast<void *>(0)));
m_ui->toolChainComboBox->setCurrentIndex(m_ui->toolChainComboBox->count() - 1); if (index >= 0)
m_ignoreChange = false; m_ui->toolChainComboBox->removeItem(index);
} else {
m_ignoreChange = true;
m_ui->toolChainComboBox->addItem(tr("<No tool chain selected>"), qVariantFromValue(static_cast<void *>(0)));
m_ui->toolChainComboBox->setCurrentIndex(m_ui->toolChainComboBox->count() - 1);
m_ignoreChange = false;
}
} }
void Qt4ProjectConfigWidget::updateToolChainCombo() void Qt4ProjectConfigWidget::updateToolChainCombo()