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

AbiWidget: Do not forget custom ABI

Browse Source 
Do not forget custom ABI when switching to a supported ABI and back.

Change-Id: Ie44f2b22727607c61aa3940a3ab4620e4e5a5ac1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-11-04 16:20:46 +01:00
parent a6c825449b
commit bdbb8a336d
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/abiwidget.cpp
View File

@@ -148,7 +148,15 @@ void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi &current)
bool blocked = blockSignals(true); bool blocked = blockSignals(true);
d->m_abi->clear(); d->m_abi->clear();
d->m_abi->addItem(tr("<custom>"), QLatin1String("custom")); Abi defaultAbi = current;
if (defaultAbi.isNull()) {
if (!abiList.isEmpty())
defaultAbi = abiList.at(0);
else
defaultAbi = Abi::hostAbi();
}
d->m_abi->addItem(tr("<custom>"), defaultAbi.toString());
d->m_abi->setCurrentIndex(0); d->m_abi->setCurrentIndex(0);
for (int i = 0; i < abiList.count(); ++i) { for (int i = 0; i < abiList.count(); ++i) {
@@ -198,10 +206,8 @@ void AbiWidget::modeChanged()
d->m_binaryFormatComboBox->setEnabled(customMode); d->m_binaryFormatComboBox->setEnabled(customMode);
d->m_wordWidthComboBox->setEnabled(customMode); d->m_wordWidthComboBox->setEnabled(customMode);
if (!customMode) {
Abi current(d->m_abi->itemData(d->m_abi->currentIndex()).toString()); Abi current(d->m_abi->itemData(d->m_abi->currentIndex()).toString());
setCustomAbi(current); setCustomAbi(current);
}
} }
void AbiWidget::customAbiChanged() void AbiWidget::customAbiChanged()
@@ -238,6 +244,7 @@ void AbiWidget::setCustomAbi(const Abi &current)
break; break;
} }
} }
if (d->m_abi->currentIndex() == 0)
d->m_abi->setItemData(0, current.toString()); d->m_abi->setItemData(0, current.toString());
blockSignals(blocked); blockSignals(blocked);