From 98992786f3ecb477e7b178237b6afee1153d59ef Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 1 Nov 2011 13:53:11 +1000 Subject: Remove redundant code from qsortfilterproxymodel test Remove a couple of "#if 1" directives (but not their contents), which have been present since before the tests were imported into the Qt repository in 2006. Change-Id: Id43aff37843e7a44ed96973f809de3838ba0e5b9 Reviewed-by: Rohan McGovern --- .../itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 497034bd2a..8922f055bc 100644 --- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -414,20 +414,18 @@ void tst_QSortFilterProxyModel::sortHierarchy_data() QTest::addColumn("initial"); QTest::addColumn("expected"); -#if 1 QTest::newRow("flat ascending") << static_cast(Qt::AscendingOrder) << (QStringList() << "c" << "f" << "d" << "e" << "a" << "b") << (QStringList() << "a" << "b" << "c" << "d" << "e" << "f"); -#endif + QTest::newRow("simple hierarchy") << static_cast(Qt::AscendingOrder) << (QStringList() << "a" << "<" << "b" << "<" << "c" << ">" << ">") << (QStringList() << "a" << "<" << "b" << "<" << "c" << ">" << ">"); -#if 1 QTest::newRow("hierarchical ascending") << static_cast(Qt::AscendingOrder) << (QStringList() @@ -488,7 +486,6 @@ void tst_QSortFilterProxyModel::sortHierarchy_data() << ">" << "i" << ">"); -#endif } void tst_QSortFilterProxyModel::sortHierarchy() -- cgit v1.2.3