diff options
author | Bill King <bill.king@nokia.com> | 2009-11-09 23:21:25 (GMT) |
---|---|---|
committer | Bill King <bill.king@nokia.com> | 2009-11-09 23:21:25 (GMT) |
commit | e80adac9902abfd423aae23dd22f490a33763228 (patch) | |
tree | 63cc04b5546454fcf668125169c6793fcdbdf04c /src/gui/widgets/qcombobox.h | |
parent | 87fb186c553d0875c92938a6fd5a9aaf8d69a057 (diff) | |
parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
download | Qt-e80adac9902abfd423aae23dd22f490a33763228.zip Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.gz Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.bz2 |
Merge branch '4.6' of ../qt into 4.6
Diffstat (limited to 'src/gui/widgets/qcombobox.h')
-rw-r--r-- | src/gui/widgets/qcombobox.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h index 0652594..5d5ea21 100644 --- a/src/gui/widgets/qcombobox.h +++ b/src/gui/widgets/qcombobox.h @@ -304,6 +304,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_itemSelected(const QModelIndex &item)) Q_PRIVATE_SLOT(d_func(), void _q_emitHighlighted(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void _q_emitCurrentIndexChanged(const QModelIndex &index)) + Q_PRIVATE_SLOT(d_func(), void _q_editingFinished()) Q_PRIVATE_SLOT(d_func(), void _q_returnPressed()) Q_PRIVATE_SLOT(d_func(), void _q_resetButton()) Q_PRIVATE_SLOT(d_func(), void _q_dataChanged(const QModelIndex &, const QModelIndex &)) |