diff options
| author | David Faure <david.faure@kdab.com> | 2017-05-28 10:49:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-31 18:54:00 +0000 |
| commit | f33cf18d882ada727da0f378525e55d9421e3b16 (patch) | |
| tree | ccd9d3034dd5a8a3794c1ccd7af9550fbc2f2a27 /src/corelib/itemmodels | |
| parent | 32a94e54b58f311f37689f4bc8e0c8a54f0f9216 (diff) | |
QAbstractItemModel::supportedDragActions: fix regression
This method now returns -1 by default, due to commit 6255cb893d
which mistakenly replaced -1 with Qt::IgnoreAction (0x0).
As a result, dropping is forbidden in a number of applications
(I detected this in zanshin).
Change-Id: I4922451216e08d5d3fe36f8ba87364a361b691bf
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/corelib/itemmodels')
| -rw-r--r-- | src/corelib/itemmodels/qabstractitemmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index c0737ffb36..f893cf06e3 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -2044,7 +2044,7 @@ Qt::DropActions QAbstractItemModel::supportedDropActions() const Qt::DropActions QAbstractItemModel::supportedDragActions() const { Q_D(const QAbstractItemModel); - if (d->supportedDragActions != Qt::IgnoreAction) + if (int(d->supportedDragActions) != -1) return d->supportedDragActions; return supportedDropActions(); } |