diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-30 03:28:43 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-30 03:41:08 (GMT) |
| commit | 68d3e2da7719ff0fc230e8204946b27018e42c14 (patch) | |
| tree | 63bfb52ada494e3498f53600787dfd5c1f7f9130 /src/declarative/graphicsitems/qdeclarativeflickable.cpp | |
| parent | 8368e041e35ab2a79c79f651a56e6ee53a46549f (diff) | |
| download | Qt-68d3e2da7719ff0fc230e8204946b27018e42c14.zip Qt-68d3e2da7719ff0fc230e8204946b27018e42c14.tar.gz Qt-68d3e2da7719ff0fc230e8204946b27018e42c14.tar.bz2 | |
Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 98502fd..fb22429 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -137,7 +137,8 @@ QDeclarativeFlickablePrivate::QDeclarativeFlickablePrivate() void QDeclarativeFlickablePrivate::init() { Q_Q(QDeclarativeFlickable); - viewport->setParent(q); + QDeclarative_setParent_noEvent(viewport, q); + viewport->setParentItem(q); static int timelineUpdatedIdx = -1; static int timelineCompletedIdx = -1; static int flickableTickedIdx = -1; |