summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-09-28 14:08:59 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-09-28 14:08:59 (GMT)
commit5784f5e0f85e7aad57aab8883f55157586b36804 (patch)
tree39a7a533a50dd965ec688a0b68e920f7a227dd5c /tests
parent893cd4dd6eb649ee00f0b5dad95c97a80d6a0d43 (diff)
downloadQt-5784f5e0f85e7aad57aab8883f55157586b36804.zip
Qt-5784f5e0f85e7aad57aab8883f55157586b36804.tar.gz
Qt-5784f5e0f85e7aad57aab8883f55157586b36804.tar.bz2
Fix tst_qsorftfilterproxymodel after 893cd4dd6eb64
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp2
1 files changed, 2 insertions, 0 deletions
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)