Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	examples/widgets/doc/src/addressbook-fr.qdoc

Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48

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);