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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Change-Id: I55d228482ceda144f903fb85eef048d53602ad18
This commit is contained in:
Eike Ziller
2022-01-24 10:34:10 +01:00
parent da225e0784 f55ec2f930
commit 51d23ad64f
18 changed files with 238 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
View File

@@ -1157,12 +1157,16 @@ QStandardItemModel *ListField::itemModel()
return m_itemModel;
}
void ListField::selectRow(int row)
bool ListField::selectRow(int row)
{
auto index = itemModel()->index(row, 0);
QModelIndex index = itemModel()->index(row, 0);
if (!index.isValid())
return false;
selectionModel()->setCurrentIndex(index, QItemSelectionModel::ClearAndSelect);
this->updateIndex();
return true;
}
QItemSelectionModel *ListField::selectionModel() const
@@ -1271,12 +1275,15 @@ QVariant ComboBoxField::toSettings() const
return {};
}
void ComboBoxField::selectRow(int row)
bool ComboBoxField::selectRow(int row)
{
ListField::selectRow(row);
if (!ListField::selectRow(row))
return false;
auto w = qobject_cast<QComboBox *>(widget());
w->setCurrentIndex(row);
return true;
}
int ComboBoxField::selectedRow() const