diff options
| author | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2013-03-13 11:39:36 +0100 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2013-03-13 14:32:47 +0100 |
| commit | dd4bd99c89ac2697468e3fccfba0f7aa28fa1c39 (patch) | |
| tree | 76ee603b89c79c1bef053642bb09ded27a328d72 /doc/src/qtquick/qtquick-buttons.qdoc | |
| parent | 8c97b21e2aa32cb8097e0b0abc3a9a77e570f136 (diff) | |
| download | qt-creator-dd4bd99c89ac2697468e3fccfba0f7aa28fa1c39.tar.gz | |
Doc: replace "element" with "QML type" or "item"
Try to make terminology more consistent, by using
"QML type" when describing the types, "item" when
describing instances of QML types, and "component"
when describing objects built by using QML types.
Change-Id: Ie03f3a7e6f483471e344ae1f35bec0742173b27c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'doc/src/qtquick/qtquick-buttons.qdoc')
| -rw-r--r-- | doc/src/qtquick/qtquick-buttons.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/qtquick-buttons.qdoc index 844e89a573..211049ad5a 100644 --- a/doc/src/qtquick/qtquick-buttons.qdoc +++ b/doc/src/qtquick/qtquick-buttons.qdoc @@ -60,8 +60,8 @@ \endlist \li Drag and drop a \gui {Text} item on top of the \gui Rectangle. This - creates a nested element where \gui Rectangle is the parent element - of \gui Text. Elements are positioned relative to their parents. + creates a nested item where \gui Rectangle is the parent item + of \gui Text. Items are positioned relative to their parents. \li In the \gui Properties pane, edit the properties of the \gui Text item. @@ -92,7 +92,7 @@ To create a graphical button that scales beautifully without using vector graphics, use the \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-borderimage.html} - {Border Image} element. For more information, see + {Border Image} type. For more information, see \l{Creating Scalable Buttons and Borders}. */ @@ -109,11 +109,11 @@ You can use the \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-borderimage.html} - {Border Image} element to display an image, such as a PNG file, as a border + {Border Image} type to display an image, such as a PNG file, as a border and a background. - Use two Border Image elements and suitable graphics to make it look like the - button is pushed down when it is clicked. One of the Border Image elements + Use two Border Image items and suitable graphics to make it look like the + button is pushed down when it is clicked. One of the Border Image items is visible by default. You can specify that it is hidden and the other one becomes visible when the mouse is clicked. @@ -250,7 +250,7 @@ \endlist - \li In the code editor, add to the \c MouseArea item a pointer to the + \li In the code editor, add to the \c MouseArea a pointer to the \c clicked expression that you added earlier: \c {onClicked: parent.clicked()}. |