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 /tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp | |
| 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 'tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp')
| -rw-r--r-- | tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp index dca718a6d8..cff26be7bb 100644 --- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp +++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp @@ -125,6 +125,7 @@ private slots: void itemRoleNames(); void getMimeDataWithInvalidModelIndex(); + void supportedDragDropActions(); private: QAbstractItemModel *m_model; @@ -1666,5 +1667,12 @@ void tst_QStandardItemModel::getMimeDataWithInvalidModelIndex() QVERIFY(!data); } +void tst_QStandardItemModel::supportedDragDropActions() +{ + QStandardItemModel model; + QCOMPARE(model.supportedDragActions(), Qt::CopyAction | Qt::MoveAction); + QCOMPARE(model.supportedDropActions(), Qt::CopyAction | Qt::MoveAction); +} + QTEST_MAIN(tst_QStandardItemModel) #include "tst_qstandarditemmodel.moc" |