diff options
| -rw-r--r-- | doc/src/declarative/tutorial2.qdoc | 4 | ||||
| -rw-r--r-- | src/declarative/canvas/qsimplecanvasitem.cpp | 18 | ||||
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 8 | ||||
| -rw-r--r-- | src/declarative/timeline/gfxeasing.cpp | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/doc/src/declarative/tutorial2.qdoc b/doc/src/declarative/tutorial2.qdoc index 8898e68..db846b8 100644 --- a/doc/src/declarative/tutorial2.qdoc +++ b/doc/src/declarative/tutorial2.qdoc @@ -53,7 +53,7 @@ The root element of our component is an \c Item. It is the most basic 'Fx' eleme </properties> \endcode -We declare a \c color property. This property is accessible from \i outside our component, this allows us to instantiate the cells with different colors. +We declare a \c color property. This property is accessible from \e outside our component, this allows us to instantiate the cells with different colors. \code <Rect anchors.fill="{parent}" color="{CellContainer.color}"/> @@ -71,7 +71,7 @@ We bind the \c color property of this \c Rect to the color property of our compo In order to change the color of the text when clicking on a cell, we create a \c MouseRegion element with the same size as its parent. -The \c onClick property sets the \c color property of the element named \i HelloText to our cell color. +The \c onClick property sets the \c color property of the element named \e HelloText to our cell color. \section2 The main QML file diff --git a/src/declarative/canvas/qsimplecanvasitem.cpp b/src/declarative/canvas/qsimplecanvasitem.cpp index 3d3bf84..5e4b5fa 100644 --- a/src/declarative/canvas/qsimplecanvasitem.cpp +++ b/src/declarative/canvas/qsimplecanvasitem.cpp @@ -238,15 +238,15 @@ QPointF QSimpleCanvasItem::scenePos() const Controls the point about which simple transforms like scale apply. - \o TopLeft The top-left corner of the item. - \o TopCenter The center point of the top of the item. - \o TopRight The top-right corner of the item. - \o MiddleLeft The left most point of the vertical middle. - \o Center The center of the item. - \o MiddleRight The right most point of the vertical middle. - \o BottomLeft The bottom-left corner of the item. - \o BottomCenter The center point of the bottom of the item. - \o BottomRight The bottom-right corner of the item. + \value TopLeft The top-left corner of the item. + \value TopCenter The center point of the top of the item. + \value TopRight The top-right corner of the item. + \value MiddleLeft The left most point of the vertical middle. + \value Center The center of the item. + \value MiddleRight The right most point of the vertical middle. + \value BottomLeft The bottom-left corner of the item. + \value BottomCenter The center point of the bottom of the item. + \value BottomRight The bottom-right corner of the item. */ /*! diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 0f60870..83d500c 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -96,10 +96,10 @@ QML_DEFINE_TYPE(QmlComponent,Component); Specifies the loading status of the QmlComponent. - \o Null This QmlComponent has no data. Call loadUrl() or setData() to add QML content. - \o Ready This QmlComponent is ready and create() may be called. - \o Loading This QmlComponent is loading network data. - \o Error An error has occured. Calling errorDescription() to retrieve a description. + \value Null This QmlComponent has no data. Call loadUrl() or setData() to add QML content. + \value Ready This QmlComponent is ready and create() may be called. + \value Loading This QmlComponent is loading network data. + \value Error An error has occured. Calling errorDescription() to retrieve a description. */ void QmlComponentPrivate::typeDataReady() diff --git a/src/declarative/timeline/gfxeasing.cpp b/src/declarative/timeline/gfxeasing.cpp index e2eff9c..45b84eb 100644 --- a/src/declarative/timeline/gfxeasing.cpp +++ b/src/declarative/timeline/gfxeasing.cpp @@ -612,7 +612,7 @@ GfxEasing::GfxEasing(Curve curve) Curve names have the form \c {ease<CurveName>[(<arg>: <arg value>[, <arg2>: <arg value>])]}. The - \i CurveName is equivalent to the GfxEasing::Curve enum name. Some more + \e CurveName is equivalent to the GfxEasing::Curve enum name. Some more advanced curves can take arguments to further refine their behaviour. Where applicable, these parameters are described in the corresponding GfxEasing::Curve value documentation. |