diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-11 12:06:15 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-11 12:57:13 +0200 |
| commit | d2d0e08e584c780b4b70a37e7b39c6bbcc7bc63e (patch) | |
| tree | 22582b82dd5bb370205aa66302fb238bf5edaa6e /examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc | |
| parent | c3431db7a3eb6b0c6e325e2d1e16eb6def9a4b4d (diff) | |
| parent | 744164e6c92cb721d2a339cee8c465e1685723f9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_scrollindicator.qml
Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b
Diffstat (limited to 'examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc')
| -rw-r--r-- | examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index 173403ac..519d1c7a 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -149,7 +149,7 @@ how to navigate between several pages. \printuntil } We replace the default \c{MainForm {...}} code block with a Page, which is -sized to occupy all the space on the window using the \l{anchors.fill} +sized to occupy all the space on the window using the \l {Item::}{anchors.fill} property. Then, we assign a \l Label to its \l {Page::}{header} property. Label extends @@ -245,7 +245,7 @@ Here is our ListView: \section2 Sizing and Positioning The first thing we do is set a size for the view. It should fill the available -space on the page, so we use \l {Item::anchors}{anchors.fill}. Note that +space on the page, so we use \l {Item::}{anchors.fill}. Note that Page ensures that its header and footer have enough of their own space reserved, so the view in this case will sit below the header, for example. |