qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Abstract proxy model: Add missing delegation of supportedDragActions 

Change-Id: I4d2519aaa46d3ca075330c6680dd3672249cbefe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
Eike Ziller 2014-09-23 15:44:47 +02:00
parent 276a5f5acf
commit 3ea0020d3b
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/itemmodels/qabstractproxymodel.cpp
View File

@ -425,6 +425,15 @@ QStringList QAbstractProxyModel::mimeTypes() const
return d->model->mimeTypes(); return d->model->mimeTypes();
} }
/*!
\reimp
*/
Qt::DropActions QAbstractProxyModel::supportedDragActions() const
{
Q_D(const QAbstractProxyModel);
return d->model->supportedDragActions();
}
/*! /*!
\reimp \reimp
*/ */

1
src/corelib/itemmodels/qabstractproxymodel.h
View File

@ -96,6 +96,7 @@ public:
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
QStringList mimeTypes() const; QStringList mimeTypes() const;
Qt::DropActions supportedDragActions() const;
Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const;
Q_SIGNALS: Q_SIGNALS:

20
tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
View File

@ -72,6 +72,7 @@ private slots:
void submit(); void submit();
void testRoleNames(); void testRoleNames();
void testSwappingRowsProxy(); void testSwappingRowsProxy();
void testDragAndDrop();
}; };
// Subclass that exposes the protected functions. // Subclass that exposes the protected functions.
@ -495,6 +496,25 @@ void tst_QAbstractProxyModel::testSwappingRowsProxy()
} }
} }
class StandardItemModelWithCustomDragAndDrop : public QStandardItemModel
{
public:
QStringList mimeTypes() const { return QStringList() << QStringLiteral("foo/mimetype"); }
Qt::DropActions supportedDragActions() const { return Qt::CopyAction | Qt::LinkAction; }
Qt::DropActions supportedDropActions() const { return Qt::MoveAction; }
};
void tst_QAbstractProxyModel::testDragAndDrop()
{
StandardItemModelWithCustomDragAndDrop sourceModel;
SubQAbstractProxyModel proxy;
proxy.setSourceModel(&sourceModel);
QCOMPARE(proxy.mimeTypes(), sourceModel.mimeTypes());
QCOMPARE(proxy.supportedDragActions(), sourceModel.supportedDragActions());
QCOMPARE(proxy.supportedDropActions(), sourceModel.supportedDropActions());
}
QTEST_MAIN(tst_QAbstractProxyModel) QTEST_MAIN(tst_QAbstractProxyModel)
#include "tst_qabstractproxymodel.moc" #include "tst_qabstractproxymodel.moc"