QComboBox: fix use in QDataWidgetMapper/QItemDelegate
authorMark Brand <mabrand@mabrand.nl>
Sat, 13 Oct 2012 11:41:30 +0000 (13:41 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 26 Oct 2012 13:24:00 +0000 (15:24 +0200)
commit84787d82ee9369b2a83c5b0568ee62ab602a5528
tree56ba0976b2a8acc32c334d2918dd150349ffbfc2
parent4fbdb969fb4e446eab01f27eb2c880f8d6cb9106
QComboBox: fix use in QDataWidgetMapper/QItemDelegate

QItemDelegate and QDataWidgetMapper use the WRITE method on the USER
property to set a value in a widget. This did not work for QComboBox
whose USER property currentText lacked a WRITE method.

This change adds the missing setter and flags it as the WRITE method.

The setter setCurrentText() simply calls setEditText() if the combo
box is editable. Otherwise, if there is a matching text in the list,
currentIndex is set to the corresponding index.

Test included.

Follow-up to 816c5540179362500dfc175b77f05abf3ef25233 which restored
currentText as the USER property.

Task-number: QTBUG-26501
Change-Id: I5f2f999e60b09728ca03ead4e28fe36d1f3ee189
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
src/widgets/widgets/qcombobox.cpp
src/widgets/widgets/qcombobox.h
tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp