Merge branch 'stable' into dev

Conflicts:
	.qmake.conf

Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557

1 files changed, 5 insertions, 5 deletions

diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 374d4397ff..46f95f16cb 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -881,8 +881,10 @@ QQuickItem *QQuickFlickable::contentItem()
 QQuickFlickableVisibleArea *QQuickFlickable::visibleArea()
 {
     Q_D(QQuickFlickable);
-    if (!d->visibleArea)
+    if (!d->visibleArea) {
         d->visibleArea = new QQuickFlickableVisibleArea(this);
+        d->visibleArea->updateVisible(); // calculate initial ratios
+    }
     return d->visibleArea;
 }
 
@@ -1518,8 +1520,7 @@ void QQuickFlickable::geometryChanged(const QRectF &newGeometry,
 
     bool changed = false;
     if (newGeometry.width() != oldGeometry.width()) {
-        if (xflick())
-            changed = true;
+        changed = true; // we must update visualArea.widthRatio
         if (d->hData.viewSize < 0) {
             d->contentItem->setWidth(width());
             emit contentWidthChanged();
@@ -1531,8 +1532,7 @@ void QQuickFlickable::geometryChanged(const QRectF &newGeometry,
         }
     }
     if (newGeometry.height() != oldGeometry.height()) {
-        if (yflick())
-            changed = true;
+        changed = true; // we must update visualArea.heightRatio
         if (d->vData.viewSize < 0) {
             d->contentItem->setHeight(height());
             emit contentHeightChanged();