Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix tst_qsorftfilterproxymodel after 893cd4dd6eb64
  An an assert when a QModelIndex from the wrong model is used with QSFPM.

2 files changed, 4 insertions, 0 deletions

diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
index dc8d938..fe866e5 100644
--- a/src/gui/itemviews/qsortfilterproxymodel.cpp
+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
@@ -362,6 +362,7 @@ QModelIndex QSortFilterProxyModelPrivate::proxy_to_source(const QModelIndex &pro
         return QModelIndex(); // for now; we may want to be able to set a root index later
     if (proxy_index.model() != q_func()) {
         qWarning() << "QSortFilterProxyModel: index from wrong model passed to mapToSource";
+        Q_ASSERT(!"QSortFilterProxyModel: index from wrong model passed to mapToSource");
         return QModelIndex();
     }
     IndexMap::const_iterator it = index_to_iterator(proxy_index);
@@ -379,6 +380,7 @@ QModelIndex QSortFilterProxyModelPrivate::source_to_proxy(const QModelIndex &sou
         return QModelIndex(); // for now; we may want to be able to set a root index later
     if (source_index.model() != model) {
         qWarning() << "QSortFilterProxyModel: index from wrong model passed to mapFromSource";
+        Q_ASSERT(!"QSortFilterProxyModel: index from wrong model passed to mapFromSource");
         return QModelIndex();
     }
     QModelIndex source_parent = source_index.parent();
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 66caf4a..2b62ccc 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -2796,10 +2796,12 @@ void tst_QSortFilterProxyModel::task252507_mapFromToSource()
     QCOMPARE(proxy.mapFromSource(QModelIndex()), QModelIndex());
     QCOMPARE(proxy.mapToSource(QModelIndex()), QModelIndex());
 
+#ifdef QT_NO_DEBUG  //if Qt is compiled in debug mode, this will assert
     QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapToSource ");
     QCOMPARE(proxy.mapToSource(source.index(2, 3)), QModelIndex());
     QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapFromSource ");
     QCOMPARE(proxy.mapFromSource(proxy.index(6, 2)), QModelIndex());
+#endif
 }
 
 static QStandardItem *addEntry(QStandardItem* pParent, const QString &description)