diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickxmllistmodel/data/proxyCrash.qml | 9 | ||||
| -rw-r--r-- | tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp | 24 |
2 files changed, 33 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickxmllistmodel/data/proxyCrash.qml b/tests/auto/quick/qquickxmllistmodel/data/proxyCrash.qml new file mode 100644 index 0000000000..c0c5a25e3c --- /dev/null +++ b/tests/auto/quick/qquickxmllistmodel/data/proxyCrash.qml @@ -0,0 +1,9 @@ +import QtQuick 2.0 +import QtQuick.XmlListModel 2.0 +import SortFilterProxyModel 1.0 + +SortFilterProxyModel { + source: XmlListModel { + XmlRole { } + } +} diff --git a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp index a3cfa0011a..1d5518047f 100644 --- a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp +++ b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp @@ -51,6 +51,7 @@ #include <QtCore/qtimer.h> #include <QtCore/qfile.h> #include <QtCore/qtemporaryfile.h> +#include <QtCore/qsortfilterproxymodel.h> #include "../../shared/util.h" #include <private/qqmlengine_p.h> @@ -106,6 +107,7 @@ private slots: void selectAncestor(); void roleCrash(); + void proxyCrash(); private: QString errorString(QAbstractItemModel *model) { @@ -988,6 +990,28 @@ void tst_qquickxmllistmodel::roleCrash() delete model; } +class SortFilterProxyModel : public QSortFilterProxyModel +{ + Q_OBJECT + Q_PROPERTY(QObject *source READ source WRITE setSource) + +public: + SortFilterProxyModel(QObject *parent = 0) : QSortFilterProxyModel(parent) { sort(0); } + QObject *source() const { return sourceModel(); } + void setSource(QObject *source) { setSourceModel(qobject_cast<QAbstractItemModel *>(source)); } +}; + +void tst_qquickxmllistmodel::proxyCrash() +{ + qmlRegisterType<SortFilterProxyModel>("SortFilterProxyModel", 1, 0, "SortFilterProxyModel"); + + // don't crash + QQmlComponent component(&engine, testFileUrl("proxyCrash.qml")); + QAbstractItemModel *model = qobject_cast<QAbstractItemModel *>(component.create()); + QVERIFY(model != 0); + delete model; +} + QTEST_MAIN(tst_qquickxmllistmodel) #include "tst_qquickxmllistmodel.moc" |