diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-07-18 20:02:43 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-13 10:23:30 (GMT) |
| commit | 8a205983c47a8fc3f145af0c9d5443dd939950de (patch) | |
| tree | 7f39be314a7f7d991d3c65b5738d3cabbadd27ce /src/gui/widgets | |
| parent | 37db6a414fce4820302426746f5333aa2a97d656 (diff) | |
| download | Qt-8a205983c47a8fc3f145af0c9d5443dd939950de.zip Qt-8a205983c47a8fc3f145af0c9d5443dd939950de.tar.gz Qt-8a205983c47a8fc3f145af0c9d5443dd939950de.tar.bz2 | |
make currentText the USER property for QComboBox
QItemDelegate takes the USER property as the value to be set using
model->setData(). The text is what is expected.
follow-up to b1b87a73012342dc1619a8e907ea9954d59ca564 which in Qt 4.8.0
broke the interaction between QComboBox and QItemDelegate used by
QDataWidgetMapper and item views.
Task-number: QTBUG-26501
Cherry-picked from qt5/qtbase 816c5540179362500dfc175b77f05abf3ef25233
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Change-Id: Ie9c228f2aa47f194467419398b37d05d98a70a1b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcombobox.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h index 62eddf0..b4c7821 100644 --- a/src/gui/widgets/qcombobox.h +++ b/src/gui/widgets/qcombobox.h @@ -67,8 +67,8 @@ class Q_GUI_EXPORT QComboBox : public QWidget Q_ENUMS(SizeAdjustPolicy) Q_PROPERTY(bool editable READ isEditable WRITE setEditable) Q_PROPERTY(int count READ count) - Q_PROPERTY(QString currentText READ currentText) - Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged USER true) + Q_PROPERTY(QString currentText READ currentText USER true) + Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) Q_PROPERTY(int maxVisibleItems READ maxVisibleItems WRITE setMaxVisibleItems) Q_PROPERTY(int maxCount READ maxCount WRITE setMaxCount) Q_PROPERTY(InsertPolicy insertPolicy READ insertPolicy WRITE setInsertPolicy) |