diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-02 17:11:18 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 15:51:50 +0200 |
commit | 648d5964ee38b7ec6795c2397dd8dfcd0036656e (patch) | |
tree | 25112b73b5cb8f19fac3df49a8f725b962402b6a /tests/auto/corelib/itemmodels | |
parent | e3a9ac4f369859f67fe4be2bf4a3617484e83962 (diff) |
Add a Q_PROPERTY for the sourceModel of a proxy model.
Now that Q_PROPERTY with a QObject derived type is more powerful.
This property can be used in QML so that wrappers for proxy models
do not need to be created, such as in the example
at https://codereview.qt-project.org/#change,13007
Change-Id: I6ba676549d2135585d429a28e214fef0b2a6b1f9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/corelib/itemmodels')
-rw-r--r-- | tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp index 6d61f3f832..4318721c60 100644 --- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp @@ -283,15 +283,25 @@ void tst_QAbstractProxyModel::revert() // public void setSourceModel(QAbstractItemModel* sourceModel) void tst_QAbstractProxyModel::setSourceModel() { + qRegisterMetaType<QAbstractItemModel*>(); + SubQAbstractProxyModel model; + + QCOMPARE(model.property("sourceModel"), QVariant::fromValue<QAbstractItemModel*>(0)); QStandardItemModel *sourceModel = new QStandardItemModel(&model); model.setSourceModel(sourceModel); QCOMPARE(model.sourceModel(), static_cast<QAbstractItemModel*>(sourceModel)); + QCOMPARE(model.property("sourceModel").value<QObject*>(), static_cast<QObject*>(sourceModel)); + QCOMPARE(model.property("sourceModel").value<QAbstractItemModel*>(), sourceModel); + QStandardItemModel *sourceModel2 = new QStandardItemModel(&model); model.setSourceModel(sourceModel2); QCOMPARE(model.sourceModel(), static_cast<QAbstractItemModel*>(sourceModel2)); + QCOMPARE(model.property("sourceModel").value<QObject*>(), static_cast<QObject*>(sourceModel2)); + QCOMPARE(model.property("sourceModel").value<QAbstractItemModel*>(), sourceModel2); + delete sourceModel2; QCOMPARE(model.sourceModel(), static_cast<QAbstractItemModel*>(0)); } |