diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-11 09:27:02 +0100 |
| commit | 720431716a8af66d1be73a1c9462ef12af831c90 (patch) | |
| tree | c54a9e61a4507247de404046338d38ca2828540e /src/declarative/graphicsitems | |
| parent | 6766fcf138b7cec101cd0c7d3d9a7ac42f1bfe3a (diff) | |
| parent | 9aac83d22ddbebc22fb1360d710263d349c2fdda (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 64ae2094..3042dc14 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -1331,7 +1331,7 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b) \snippet doc/src/snippets/declarative/flickable.qml document - In some cases, the the content dimensions can be automatically set + In some cases, the content dimensions can be automatically set using the \l {Item::childrenRect.width}{childrenRect.width} and \l {Item::childrenRect.height}{childrenRect.height} properties. */ |