From a3837c357ee5dd9a5a8b2bdcc17b4ce427dc5982 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 26 Apr 2013 16:27:21 -0700 Subject: [PATCH] Don't fix up x/y while initializing Any initial values leading to content outside the Flickable are likely to be explicitly set as initial property values. "fixing" them up will lead to just ignoring them. Task-number: QTBUG-30837 Change-Id: I3b2593605f16d73ba008bc6a6f067ab6020bcbe4 Reviewed-by: Andrew den Exter --- src/quick/items/qquickflickable.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index dd73578..7913cbc 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -422,12 +422,16 @@ void QQuickFlickablePrivate::fixupX_callback(void *data) void QQuickFlickablePrivate::fixupX() { Q_Q(QQuickFlickable); + if (!q->isComponentComplete()) + return; //Do not fixup from initialization values fixup(hData, q->minXExtent(), q->maxXExtent()); } void QQuickFlickablePrivate::fixupY() { Q_Q(QQuickFlickable); + if (!q->isComponentComplete()) + return; //Do not fixup from initialization values fixup(vData, q->minYExtent(), q->maxYExtent()); } -- 1.7.2.5