summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-11-19 23:00:14 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-11-19 23:00:14 (GMT)
commit1d11e612c2970af69061806b40b0d632a87a8309 (patch)
treeae332b14b6ee1542519b728e2414b3a270525372 /src/declarative/graphicsitems
parentca1fcd8e9cbedab190efdb456f78e5f604293b3b (diff)
parent0cfa6daa4776cd78370e644fae3005ae432b83c7 (diff)
downloadQt-1d11e612c2970af69061806b40b0d632a87a8309.zip
Qt-1d11e612c2970af69061806b40b0d632a87a8309.tar.gz
Qt-1d11e612c2970af69061806b40b0d632a87a8309.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/graphicsitems')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 3a3189c..1870647 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -386,6 +386,13 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
\snippet doc/src/snippets/declarative/flickable.qml document
\clearfloat
+
+ Items declared as children of a Flickable are automatically parented to the
+ Flickable's \l contentItem. This should be taken into account when
+ operating on the children of the Flickable; it is usually the children of
+ \c contentItem that are relevant. For example, the bound of Items added
+ to the Flickable will be available by \c contentItem.childrenRect
+
\section1 Limitations
\note Due to an implementation detail, items placed inside a Flickable cannot anchor to it by