diff options
author | Martin Jones <martin.jones@nokia.com> | 2012-07-11 16:29:42 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 04:50:48 +0200 |
commit | 50ec85e368a15236812776c274cdb10ac2be0ccd (patch) | |
tree | 5666c7bba41a2895340f91b4c1a5efcb1a11078e /src/quick/items/qquickimage.cpp | |
parent | 7ddd5308946f32f4f0514c493a0a0f01c2bdc840 (diff) |
Change Quick docs to refer to "types" rather than "elements"
Task-number: QTBUG-24785
Change-Id: I223479b879514abaacb123852323c1cfada7a5e1
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/quick/items/qquickimage.cpp')
-rw-r--r-- | src/quick/items/qquickimage.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index f4089be48c..141e643d20 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -96,25 +96,25 @@ QQuickImagePrivate::QQuickImagePrivate() \inqmlmodule QtQuick 2 \ingroup qtquick-visual \inherits Item - \brief Displays an image in a declarative user interface + \brief Displays an image - The Image element is used to display images in a declarative user interface. + The Image type display an image. The source of the image is specified as a URL using the \l source property. Images can be supplied in any of the standard image formats supported by Qt, including bitmap formats such as PNG and JPEG, and vector graphics formats - such as SVG. If you need to display animated images, use the \l AnimatedImage - element. + such as SVG. If you need to display animated images, use \l AnimatedSprite + or \l AnimatedImage. If the \l{Item::width}{width} and \l{Item::height}{height} properties are not - specified, the Image element automatically uses the size of the loaded image. - By default, specifying the width and height of the element causes the image + specified, the Image automatically uses the size of the loaded image. + By default, specifying the width and height of the item causes the image to be scaled to that size. This behavior can be changed by setting the \l fillMode property, allowing the image to be stretched and tiled instead. \section1 Example Usage - The following example shows the simplest usage of the Image element. + The following example shows the simplest usage of the Image type. \snippet qml/image.qml document @@ -135,7 +135,7 @@ QQuickImagePrivate::QQuickImagePrivate() automatically loaded asynchronously, and the \l progress and \l status properties are updated as appropriate. - Images are cached and shared internally, so if several Image elements have the same \l source, + Images are cached and shared internally, so if several Image items have the same \l source, only one copy of the image will be loaded. \b Note: Images are often the greatest user of memory in QML user interfaces. It is recommended @@ -265,7 +265,7 @@ void QQuickImagePrivate::setImage(const QImage &image) \endtable - Note that \c clip is \c false by default which means that the element might + Note that \c clip is \c false by default which means that the item might paint outside its bounding rectangle even if the fillMode is set to \c PreserveAspectCrop. \sa {declarative/imageelements/image}{Image example} @@ -296,7 +296,7 @@ void QQuickImage::setFillMode(FillMode mode) In most cases it is the same as \c width and \c height, but when using a \c fillMode \c PreserveAspectFit or \c fillMode \c PreserveAspectCrop \c paintedWidth or \c paintedHeight can be smaller or larger than - \c width and \c height of the Image element. + \c width and \c height of the Image item. */ qreal QQuickImage::paintedWidth() const { |