diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/anchor-layout.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/animation.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/basictypes.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/effects.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/qmlforcpp.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/tutorial1.qdoc | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc index 9647a72..2b1f081 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/doc/src/declarative/anchor-layout.qdoc @@ -3,7 +3,7 @@ \target anchor-layout \title Anchor-based Layout -In additional to the more traditional Fx layouts \l {xmlGridLayout}{GridLayout}, \l {xmlHorizontalLayout}{HorizontalLayout}, and \l {xmlVerticalLayout}{VerticalLayout}, QML also provides a way to layout items using the concept of anchors. Each visual Fx item can be thought of as having a set of 6 invisible "anchor lines": \e left, \e horizontalCenter, \e right, \e top, \e verticalCenter, and \e bottom. +In additional to the more traditional Fx layouts GridLayout, HorizontalLayout, and VerticalLayout, QML also provides a way to layout items using the concept of anchors. Each visual Fx item can be thought of as having a set of 6 invisible "anchor lines": \e left, \e horizontalCenter, \e right, \e top, \e verticalCenter, and \e bottom. \image edges_qml.png diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc index a1ab44b..a143d4c 100644 --- a/doc/src/declarative/animation.qdoc +++ b/doc/src/declarative/animation.qdoc @@ -126,5 +126,5 @@ Transitions can happen in parallel, in sequence, or in any combination of the tw \section1 Property Behaviors -\todo Document. Should we remove property behaviour altogether? +\note Property behaviors are currently experimental. */ diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc index d6dae77..a6b9177 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/doc/src/declarative/basictypes.qdoc @@ -367,7 +367,7 @@ types. When used from QML, the engine automatically appends each value to the list. - For example, the \l {xmlItem}{Item} class has a children list property + For example, the \l Item class has a children list property that can be used like this: \code <Item> diff --git a/doc/src/declarative/effects.qdoc b/doc/src/declarative/effects.qdoc index c7cd2f6..e3c68bd 100644 --- a/doc/src/declarative/effects.qdoc +++ b/doc/src/declarative/effects.qdoc @@ -24,7 +24,7 @@ backends may be added if the performance can be made acceptable. \o \l Shadow \o \l Blur \o \l Reflection -\o \l Highlights +\o \l Highlight \o \l Particles \endlist diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc index 7aa2560..f0675fe 100644 --- a/doc/src/declarative/qmlforcpp.qdoc +++ b/doc/src/declarative/qmlforcpp.qdoc @@ -545,7 +545,7 @@ "signal properties", using the name "on<Signal Name>" where the first character of the signal's name is uppercased. If more than one signal of the same name is exist on a class, only the first is available (see the - \l {xmlConnection}{<Connection>} element for more general signal connections). + \l Connection element for more general signal connections). An important observation to make here is the lack of braces. While both property bindings and signal properties involve executing ECMAScript code, diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc index 15edaff..caadbf5 100644 --- a/doc/src/declarative/tutorial1.qdoc +++ b/doc/src/declarative/tutorial1.qdoc @@ -23,9 +23,9 @@ Here is the QML code for the application: <Rect id="Page" width="480" height="200" color="white"> \endcode -First, we declare a root element of type \l {xmlRect}{Rect}. It is one of the basic building blocks you can use to create an application in QML. +First, we declare a root element of type \l Rect. It is one of the basic building blocks you can use to create an application in QML. We give it an id to be able to refer to it later. In this case, we call it \e Page. We also set the \c width, \c height and \c color properties. -The \l {xmlRect}{Rect} element contains many other properties (such as \c x and \c y), but these are left at their default values. +The \l Rect element contains many other properties (such as \c x and \c y), but these are left at their default values. \section2 Text element |