summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-08-06 09:24:35 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-08-06 09:27:05 (GMT)
commitdc4211f350e8d8cce19546b770c28b2a7a643042 (patch)
tree1cfbd7664b16bbf74aeafe3bc2a7cffe766df965
parentb743da8cff8b72a371214c1959e34d8cf9086aa3 (diff)
downloadQt-dc4211f350e8d8cce19546b770c28b2a7a643042.zip
Qt-dc4211f350e8d8cce19546b770c28b2a7a643042.tar.gz
Qt-dc4211f350e8d8cce19546b770c28b2a7a643042.tar.bz2
Fix compilation of the test
view doesn't exist anymore and the qWait should be enough to make the x11 call useless
-rw-r--r--tests/auto/qtableview/tst_qtableview.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 6fa57f0..eb39dd7 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -2542,7 +2542,7 @@ void tst_QTableView::span_data()
<< 2 << 1
<< false;
- /* This makes no sens.
+ /* This makes no sens.
QTest::newRow("top left 2x0")
<< 10 << 10
<< -1 << -1
@@ -2631,7 +2631,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);
@@ -3110,14 +3110,14 @@ void tst_QTableView::task227953_setRootIndex()
}
tableView.setModel(&model);
-
+
//show the first 10 rows of the first table
QModelIndex root = model.indexFromItem(&item1);
tableView.setRootIndex(root);
for (int i = 10; i != 40; ++i) {
tableView.setRowHidden(i, true);
}
-
+
QCOMPARE(tableView.verticalHeader()->count(), 40);
QCOMPARE(tableView.verticalHeader()->hiddenSectionCount(), 30);
@@ -3139,16 +3139,13 @@ void tst_QTableView::task240266_veryBigColumn()
table.setColumnWidth(1, 100); //normal column
table.setColumnWidth(2, 9000); //very big column
table.show();
-#ifdef Q_WS_X11
- qt_x11_wait_for_window_manager(&view);
-#endif
QTest::qWait(100);
QScrollBar *scroll = table.horizontalScrollBar();
QCOMPARE(scroll->minimum(), 0);
QCOMPARE(scroll->maximum(), model.columnCount() - 1);
QCOMPARE(scroll->singleStep(), 1);
-
+
//1 is not always a very correct value for pageStep. Ideally this should be dynamic.
//Maybe something for Qt 5 ;-)
QCOMPARE(scroll->pageStep(), 1);