From 256d140933216b64123d1c50dd5e047898037ec2 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 21 Feb 2019 00:45:26 +0300 Subject: [PATCH] Fix missed item for 16-bit word width ABI GCC compiler for 8-bit AVR architecture returns the define '__SIZEOF_SIZE_T__' with the value of 2. It means that the ABI's word width is 16-bit. But the ABI's combobox shows the 32-bit word width instead. The issue was in the missed 16-bit word width item in that combobox. Change-Id: Icf6accf6f233170c21254c43983167dbd1b59ded Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/abiwidget.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp index d4a3070d695..80b88ac03e4 100644 --- a/src/plugins/projectexplorer/abiwidget.cpp +++ b/src/plugins/projectexplorer/abiwidget.cpp @@ -140,10 +140,12 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent), d->m_wordWidthComboBox = new QComboBox(this); layout->addWidget(d->m_wordWidthComboBox); + d->m_wordWidthComboBox->addItem(Abi::toString(16), 16); d->m_wordWidthComboBox->addItem(Abi::toString(32), 32); d->m_wordWidthComboBox->addItem(Abi::toString(64), 64); d->m_wordWidthComboBox->addItem(Abi::toString(0), 0); - d->m_wordWidthComboBox->setCurrentIndex(2); + // Setup current word width of 0 by default. + d->m_wordWidthComboBox->setCurrentIndex(d->m_wordWidthComboBox->count() - 1); connect(d->m_wordWidthComboBox, static_cast(&QComboBox::currentIndexChanged), this, &AbiWidget::customComboBoxesChanged);