diff options
| author | David Faure <david.faure@kdab.com> | 2014-11-18 21:47:41 +0100 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2014-11-24 08:05:43 +0100 |
| commit | 736ac191565196514e14f875c774771026f95d7e (patch) | |
| tree | 15f207893c31f457da256fd19df34ba6892ac97d /src/corelib/itemmodels/qabstractproxymodel_p.h | |
| parent | dcbf704bc0f3e7cdedb5c0839575a7f9546fc245 (diff) | |
QAbstractProxyModel: fix canDropMimeData/dropMimeData implementations
The code in 4696e9dbaa4 was incorrect. It is perfectly valid to call
these methods with row=-1 column=1 parent=some_index, this is exactly
what happens in QListView and QTableView. Child row/column is only for
trees.
Move the coordinate mapping from QSortFilterProxyModel into a new
mapDropCoordinatesToSource internal method, used by QAbstractProxyModel.
Task-number: QTBUG-39549
Change-Id: I3312210473d84b639cbe4c01f70ea36437db3e91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Stephen Kelly <steveire@gmail.com>
Diffstat (limited to 'src/corelib/itemmodels/qabstractproxymodel_p.h')
| -rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/itemmodels/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h index 9402092fa8..24af5afc64 100644 --- a/src/corelib/itemmodels/qabstractproxymodel_p.h +++ b/src/corelib/itemmodels/qabstractproxymodel_p.h @@ -59,6 +59,8 @@ public: QAbstractProxyModelPrivate() : QAbstractItemModelPrivate(), model(0) {} QAbstractItemModel *model; virtual void _q_sourceModelDestroyed(); + void mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent, + int *source_row, int *source_column, QModelIndex *source_parent) const; }; QT_END_NAMESPACE |