1 files changed, 35 insertions, 0 deletions
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 4578bcdab6..923b9a3a07 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -148,6 +148,7 @@ private slots:
 
     void chainedProxyModelRoleNames();
 
+    void noMapAfterSourceDelete();
 protected:
     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
     void checkHierarchy(const QStringList &data, const QAbstractItemModel *model);
@@ -3809,5 +3810,39 @@ void tst_QSortFilterProxyModel::chainedProxyModelRoleNames()
     QVERIFY(proxy2.roleNames().value(Qt::UserRole + 1) == "custom");
 }
 
+class SourceAssertion : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    explicit SourceAssertion(QObject *parent = 0)
+      : QSortFilterProxyModel(parent)
+    {
+
+    }
+
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const
+    {
+      Q_ASSERT(sourceModel());
+      return QSortFilterProxyModel::mapToSource(proxyIndex);
+    }
+};
+
+void tst_QSortFilterProxyModel::noMapAfterSourceDelete()
+{
+    SourceAssertion proxy;
+    QStringListModel *model = new QStringListModel(QStringList() << "Foo" << "Bar");
+
+    proxy.setSourceModel(model);
+
+    // Create mappings
+    QPersistentModelIndex persistent = proxy.index(0, 0);
+
+    QVERIFY(persistent.isValid());
+
+    delete model;
+
+    QVERIFY(!persistent.isValid());
+}
+
 QTEST_MAIN(tst_QSortFilterProxyModel)
 #include "tst_qsortfilterproxymodel.moc"