diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 20:59:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 20:59:06 +0200 |
| commit | e8d4677e309e11cc5177bc10d9d01aa200407cee (patch) | |
| tree | b0a3f0200455ba22452e076017a2e64cd602fb3c /src/layouts | |
| parent | 59f7b30d41b06b1d9da81aea5784d57ecd91ab04 (diff) | |
| parent | 53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 (diff) | |
| download | qtquickcontrols-e8d4677e309e11cc5177bc10d9d01aa200407cee.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Id85e82801b77faf9a32177838025696aab64f002
Diffstat (limited to 'src/layouts')
| -rw-r--r-- | src/layouts/qquickstacklayout.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/layouts/qquickstacklayout.cpp b/src/layouts/qquickstacklayout.cpp index 3ada3b1e..66513bfd 100644 --- a/src/layouts/qquickstacklayout.cpp +++ b/src/layouts/qquickstacklayout.cpp @@ -50,11 +50,11 @@ The index corresponds to the order of the StackLayout's children. In contrast to most other layouts, child Items' \l{Layout::fillWidth}{Layout.fillWidth} and \l{Layout::fillHeight}{Layout.fillHeight} properties - defaults to \c true. As a consequence, child items are by default filled to match the size of the StackLayout as long as their + default to \c true. As a consequence, child items are by default filled to match the size of the StackLayout as long as their \l{Layout::maximumWidth}{Layout.maximumWidth} or \l{Layout::maximumHeight}{Layout.maximumHeight} does not prevent it. Items are added to the layout by reparenting the item to the layout. Similarly, removal is done by reparenting the item from the layout. - Both of these operations will affect the layouts \l count property. + Both of these operations will affect the layout's \l count property. The following code will create a StackLayout where only the 'plum' rectangle is visible. \code @@ -102,7 +102,7 @@ QQuickStackLayout::QQuickStackLayout(QQuickItem *parent) : /*! \qmlproperty int StackLayout::count - This property holds the number of items that belongs to the layout. + This property holds the number of items that belong to the layout. Only items that are children of the StackLayout will be candidates for layouting. */ @@ -115,8 +115,8 @@ int QQuickStackLayout::count() const /*! \qmlproperty int StackLayout::currentIndex - This property holds the current index of which of the StackLayout's items that should be visible. - By default it will be -1 for an empty layout, otherwise the default is 0 (referring to the first item). + This property holds the index of the child item that is currently visible in the StackLayout. + By default it will be \c -1 for an empty layout, otherwise the default is \c 0 (referring to the first item). */ int QQuickStackLayout::currentIndex() const { |