diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-02 15:07:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 16:26:21 +0200 |
| commit | 0a3eb0fe443f8158d81d97cde8f0c9a9632fb9f0 (patch) | |
| tree | 7bbdc72a7e30e23fc66a610ff7e3cd298711e5b1 /tests/auto/widgets/itemviews | |
| parent | cee7380c0470dc591e2aafb3225641d4194ab05c (diff) | |
| parent | 190fa97c83472863fd886e86f626ab8196ed51b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/widgets/itemviews')
| -rw-r--r-- | tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index c17e2523f9..d3191b2206 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -419,12 +419,15 @@ void tst_QColumnView::scrollTo() QWidget w; w.show(); + QCOMPARE(view.HorizontalOffset(), 0); if (giveFocus) view.setFocus(Qt::OtherFocusReason); else view.clearFocus(); + QCOMPARE(view.HorizontalOffset(), 0); qApp->processEvents(); + QCOMPARE(view.HorizontalOffset(), 0); QTRY_COMPARE(view.hasFocus(), giveFocus); // scroll to the right int level = 0; @@ -440,10 +443,8 @@ void tst_QColumnView::scrollTo() if (level >= 2) { if (!reverse) { QTRY_VERIFY(view.HorizontalOffset() < 0); - if (last <= view.HorizontalOffset()) { - qDebug() << "Test failure. last=" << last + qDebug() << "last=" << last << " ; HorizontalOffset= " << view.HorizontalOffset(); - } QTRY_VERIFY(last > view.HorizontalOffset()); } else { QTRY_VERIFY(view.HorizontalOffset() > 0); |