diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-04-06 22:47:32 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-04-06 22:47:32 (GMT) |
| commit | bccb7b178c0255c74d648c3972895f66a70fd87b (patch) | |
| tree | ead94cee89e2ffda4127201b734f1660f1389585 /tests/auto/qtableview/tst_qtableview.cpp | |
| parent | 423d6052844b2026c8acc8826d6546d3afc494d3 (diff) | |
| parent | cf42b485ebc1ab3e1f0a804b8c4e404fa99f1f6f (diff) | |
| download | Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.zip Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.tar.gz Qt-bccb7b178c0255c74d648c3972895f66a70fd87b.tar.bz2 | |
Merge branch 'master' into contiguouscache
Diffstat (limited to 'tests/auto/qtableview/tst_qtableview.cpp')
| -rw-r--r-- | tests/auto/qtableview/tst_qtableview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index a9b41d8..9595155 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -2540,6 +2540,7 @@ void tst_QTableView::span_data() << 2 << 1 << false; + /* This makes no sens. QTest::newRow("top left 2x0") << 10 << 10 << -1 << -1 @@ -2554,7 +2555,7 @@ void tst_QTableView::span_data() << 0 << 0 << 0 << 2 << 0 << 2 - << false; + << false;*/ QTest::newRow("invalid 2x2") << 10 << 10 @@ -2628,7 +2629,7 @@ void tst_QTableView::span() view.hideRow(hiddenRow); view.hideColumn(hiddenColumn); view.show(); - + QCOMPARE(view.rowSpan(row, column), expectedRowSpan); QCOMPARE(view.columnSpan(row, column), expectedColumnSpan); |