summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtableview/tst_qtableview.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-09-04 11:35:17 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-09-04 11:35:17 (GMT)
commitb576bca55f88ed749a0a2b409be986dbf6b96b0a (patch)
tree69789d636ff2328cfc4101851f9a28de4a2a825e /tests/auto/qtableview/tst_qtableview.cpp
parent0b8062f5fbd7622a528ce61b767d00fbcdfc74a0 (diff)
parent9d85dcf10d580a45c261e3e1a8d8df7d41cb9437 (diff)
downloadQt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.zip
Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.gz
Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qtableview/tst_qtableview.cpp')
-rw-r--r--tests/auto/qtableview/tst_qtableview.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 39ab4c6..6fe2963 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -2487,6 +2487,11 @@ void tst_QTableView::indexAt()
QtTestTableView view;
view.show();
+
+ //some styles change the scroll mode in their polish
+ view.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem);
+ view.setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
+
view.setModel(&model);
view.setSpan(row, column, rowSpan, columnSpan);
view.hideRow(hiddenRow);
@@ -3143,6 +3148,10 @@ void tst_QTableView::task240266_veryBigColumn()
table.show();
QTest::qWait(100);
+ //some styles change the scroll mode in their polish
+ table.setHorizontalScrollMode(QAbstractItemView::ScrollPerItem);
+ table.setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
+
QScrollBar *scroll = table.horizontalScrollBar();
QCOMPARE(scroll->minimum(), 0);
QCOMPARE(scroll->maximum(), model.columnCount() - 1);