diff options
| author | Alan Alpert <aalpert@blackberry.com> | 2013-04-26 16:27:21 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-10 00:58:39 +0200 |
| commit | a3837c357ee5dd9a5a8b2bdcc17b4ce427dc5982 (patch) | |
| tree | 3744163d9941066d1ec5830672b01b537bef6f48 /src/quick | |
| parent | 84b233f992447aa9ac7e0067239793f6241c4017 (diff) | |
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 <andrew.den.exter@qinetic.com.au>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | 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 dd7357822a..7913cbc371 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()); } |