diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-01 12:24:18 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-11-07 09:57:23 +0000 |
| commit | 54e2a977b93a37ff6b7dd5c28396f912408bf0f1 (patch) | |
| tree | 771f51894528b4bfc1b13ea24ec7ac9cfcd62fb1 | |
| parent | 9ca74997d5abde8ce4b8443b08532644e871acae (diff) | |
ProjectExplorer: Code cleanups for AbiWidget
Change-Id: I501d7a30413ea13c5ba7f6d8e3b990f615629b5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/abiwidget.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp index 5262ffc66f..249f2bf329 100644 --- a/src/plugins/projectexplorer/abiwidget.cpp +++ b/src/plugins/projectexplorer/abiwidget.cpp @@ -154,8 +154,14 @@ AbiWidget::~AbiWidget() void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi ¤t) { QSignalBlocker blocker(this); + + // Initial setup of ABI combobox: d->m_abi->clear(); + d->m_abi->addItem(tr("<custom>")); + d->m_abi->setCurrentIndex(0); + d->m_abi->setVisible(!abiList.isEmpty()); + // Set up custom ABI: Abi defaultAbi = current; if (defaultAbi.isNull()) { if (!abiList.isEmpty()) @@ -164,20 +170,20 @@ void AbiWidget::setAbis(const QList<Abi> &abiList, const Abi ¤t) defaultAbi = Abi::hostAbi(); } - d->m_abi->addItem(tr("<custom>")); - d->m_abi->setCurrentIndex(0); setCustomAbi(defaultAbi); + // Add supported ABIs: for (int i = 0; i < abiList.count(); ++i) { - int index = i + 1; - const QString abiString = abiList.at(i).toString(); + const int index = i + 1; + const Abi abi = abiList.at(i); + const QString abiString = abi.toString(); d->m_abi->insertItem(index, abiString, abiString); - if (abiList.at(i) == defaultAbi) + if (abi == defaultAbi) d->m_abi->setCurrentIndex(index); } - d->m_abi->setVisible(!abiList.isEmpty()); + // Select a sensible ABI to start with if none was set yet. if (d->isCustom() && !current.isValid() && !abiList.isEmpty()) d->m_abi->setCurrentIndex(1); // default to the first Abi if none is selected. |