diff options
Diffstat (limited to 'tests/auto/widgets/itemviews')
| -rw-r--r-- | tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp | 9 | ||||
| -rw-r--r-- | tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp index 7e246e5936..5aea32996c 100644 --- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp @@ -1585,12 +1585,15 @@ void tst_QListWidget::task217070_scrollbarsAdjusted() v.setUniformItemSizes(true); v.resize(160,100); QTest::qWait(50); + QScrollBar *hbar = v.horizontalScrollBar(); + QScrollBar *vbar = v.verticalScrollBar(); + QVERIFY(hbar && vbar); for(int f=150; f>90 ; f--) { v.resize(f,100); QTest::qWait(30); - QVERIFY(v.verticalScrollBar()->isVisible()); - //the vertical scrollbar must not be visible. - QVERIFY(!v.horizontalScrollBar()->isVisible()); + QVERIFY(vbar->style()->styleHint(QStyle::SH_ScrollBar_Transient) || vbar->isVisible()); + //the horizontal scrollbar must not be visible. + QVERIFY(!hbar->isVisible()); } } diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 80d77aa652..9038ae3b00 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -2696,7 +2696,7 @@ void tst_QTableView::indexAt_data() << 0 << 0; // expected QTest::newRow("no hidden, no span, scroll (5,0), at (20,20)") - << 10 << 10 // dim + << 20 << 20 // dim << 40 << 40 // size << -1 << -1 // hide << -1 << -1 // pos @@ -2706,7 +2706,7 @@ void tst_QTableView::indexAt_data() << 0 << 5; // expected QTest::newRow("no hidden, no span, scroll (0,5), at (20,20)") - << 10 << 10 // dim + << 20 << 20 // dim << 40 << 40 // size << -1 << -1 // hide << -1 << -1 // pos @@ -2716,7 +2716,7 @@ void tst_QTableView::indexAt_data() << 5 << 0; // expected QTest::newRow("no hidden, no span, scroll (5,5), at (20,20)") - << 10 << 10 // dim + << 20 << 20 // dim << 40 << 40 // size << -1 << -1 // hide << -1 << -1 // pos |