diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-16 16:02:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-16 16:02:19 +0200 |
| commit | e72785547696146f6172f0ef2824033e17df7b50 (patch) | |
| tree | e78d6bafd7b3bcd9e786b5da8150cf02dcf2b4bb /tests/auto/widgets/itemviews | |
| parent | ac5c64fccd6d491ee3b3a3f54460ed3464d714fc (diff) | |
| parent | 5c23199d4e8ff21661dfa5aacc13149178e78cab (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 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp index 3fa3fbe0ee..c17e2523f9 100644 --- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp +++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp @@ -440,6 +440,10 @@ void tst_QColumnView::scrollTo() if (level >= 2) { if (!reverse) { QTRY_VERIFY(view.HorizontalOffset() < 0); + if (last <= view.HorizontalOffset()) { + qDebug() << "Test failure. last=" << last + << " ; HorizontalOffset= " << view.HorizontalOffset(); + } QTRY_VERIFY(last > view.HorizontalOffset()); } else { QTRY_VERIFY(view.HorizontalOffset() > 0); @@ -457,10 +461,15 @@ void tst_QColumnView::scrollTo() view.scrollTo(index, QAbstractItemView::EnsureVisible); index = index.parent(); if (start != level) { - if (!reverse) + if (!reverse) { QTRY_VERIFY(last < view.HorizontalOffset()); - else + } else { + if (last <= view.HorizontalOffset()) { + qDebug() << "Test failure. last=" << last + << " ; HorizontalOffset= " << view.HorizontalOffset(); + } QTRY_VERIFY(last > view.HorizontalOffset()); + } } level--; last = view.HorizontalOffset(); |