diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 10:01:08 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 10:01:08 (GMT) |
| commit | 5e0bdffd92cbff2a9eb551f77850a24bf2a2116a (patch) | |
| tree | fcf764b8326d8282e7f194a4fe1b2a88a7082319 /src/gui/widgets/qcombobox.h | |
| parent | b68cd1df21935fc032a93c7d7bc33fcb77c7b8cd (diff) | |
| parent | 5d7e254583551659df42e59fab4756994d4211ed (diff) | |
| download | Qt-5e0bdffd92cbff2a9eb551f77850a24bf2a2116a.zip Qt-5e0bdffd92cbff2a9eb551f77850a24bf2a2116a.tar.gz Qt-5e0bdffd92cbff2a9eb551f77850a24bf2a2116a.tar.bz2 | |
Merge commit 'origin/4.6' into feature
Diffstat (limited to 'src/gui/widgets/qcombobox.h')
| -rw-r--r-- | src/gui/widgets/qcombobox.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h index 462636c..0652594 100644 --- a/src/gui/widgets/qcombobox.h +++ b/src/gui/widgets/qcombobox.h @@ -307,9 +307,8 @@ private: 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 &)) - Q_PRIVATE_SLOT(d_func(), void _q_rowsAboutToBeInserted(const QModelIndex & parent, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_updateIndexBeforeChange()) Q_PRIVATE_SLOT(d_func(), void _q_rowsInserted(const QModelIndex & parent, int start, int end)) - Q_PRIVATE_SLOT(d_func(), void _q_rowsAboutToBeRemoved(const QModelIndex & parent, int start, int end)) Q_PRIVATE_SLOT(d_func(), void _q_rowsRemoved(const QModelIndex & parent, int start, int end)) Q_PRIVATE_SLOT(d_func(), void _q_modelDestroyed()) Q_PRIVATE_SLOT(d_func(), void _q_modelReset()) |