diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-01 23:26:13 (GMT) |
| commit | 95814418f9d6adeba365c795462e8afb00138211 (patch) | |
| tree | f7528ae97d136474ae300daa513acc0250f02d4e /doc/src/getting-started/gettingstartedqml.qdoc | |
| parent | 88253db8a7d7910e1393b1948fb3747117538c92 (diff) | |
| parent | 119a8ddcd7c8de0607309b37f9ef83439b607f17 (diff) | |
| download | Qt-95814418f9d6adeba365c795462e8afb00138211.zip Qt-95814418f9d6adeba365c795462e8afb00138211.tar.gz Qt-95814418f9d6adeba365c795462e8afb00138211.tar.bz2 | |
Merge branch '4.7' into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
Diffstat (limited to 'doc/src/getting-started/gettingstartedqml.qdoc')
| -rw-r--r-- | doc/src/getting-started/gettingstartedqml.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 13f1192..ccb9771 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -133,7 +133,7 @@ the interactive area where mouse movements are detected. For our button, we anchor the whole MouseArea to its parent, which is \c simplebutton. The \c anchors.fill syntax is one way of accessing a specific property called \c fill inside a group of properties - called \c anchors. QML uses \l {Anchor-based Layout in QML}{anchor based layouts} where + called \c anchors. QML uses \l {Anchor-Based Layout in QML}{anchor-based layouts} where items can anchor to another item, creating robust layouts. The \c MouseArea has many signal handlers that are called during mouse movements within |