diff options
author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-03-01 19:02:20 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-13 15:27:31 +0100 |
commit | c051ea15c75851132d08f22825d84d4ea3f49241 (patch) | |
tree | ea3aa28296355f313d204f6e190f74cfd87dee0a /src/declarative/graphicsitems/qdeclarativeimage.cpp | |
parent | dc5c8d1099ac851b51accf5f87c5be4fc1610c1a (diff) |
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: Iae34eb8f2233dd9dbec79e7ab3c324f3f505b4cc
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeimage.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimage.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 90d289ff..375b9503 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -95,7 +95,7 @@ QT_BEGIN_NAMESPACE Images are cached and shared internally, so if several Image elements have the same \l source, only one copy of the image will be loaded. - \bold Note: Images are often the greatest user of memory in QML user interfaces. It is recommended + \b Note: Images are often the greatest user of memory in QML user interfaces. It is recommended that images which do not form part of the user interface have their size bounded via the \l sourceSize property. This is especially important for content that is loaded from external sources or provided by the user. @@ -149,19 +149,19 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) than the item. \list - \o Image.Stretch - the image is scaled to fit - \o Image.PreserveAspectFit - the image is scaled uniformly to fit without cropping - \o Image.PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary - \o Image.Tile - the image is duplicated horizontally and vertically - \o Image.TileVertically - the image is stretched horizontally and tiled vertically - \o Image.TileHorizontally - the image is stretched vertically and tiled horizontally + \li Image.Stretch - the image is scaled to fit + \li Image.PreserveAspectFit - the image is scaled uniformly to fit without cropping + \li Image.PreserveAspectCrop - the image is scaled uniformly to fill, cropping if necessary + \li Image.Tile - the image is duplicated horizontally and vertically + \li Image.TileVertically - the image is stretched horizontally and tiled vertically + \li Image.TileHorizontally - the image is stretched vertically and tiled horizontally \endlist \table \row - \o \image declarative-qtlogo-stretch.png - \o Stretch (default) + \li \image declarative-qtlogo-stretch.png + \li Stretch (default) \qml Image { width: 130; height: 100 @@ -171,8 +171,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-preserveaspectfit.png - \o PreserveAspectFit + \li \image declarative-qtlogo-preserveaspectfit.png + \li PreserveAspectFit \qml Image { width: 130; height: 100 @@ -183,8 +183,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-preserveaspectcrop.png - \o PreserveAspectCrop + \li \image declarative-qtlogo-preserveaspectcrop.png + \li PreserveAspectCrop \qml Image { width: 130; height: 100 @@ -196,8 +196,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-tile.png - \o Tile + \li \image declarative-qtlogo-tile.png + \li Tile \qml Image { width: 120; height: 120 @@ -207,8 +207,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-tilevertically.png - \o TileVertically + \li \image declarative-qtlogo-tilevertically.png + \li TileVertically \qml Image { width: 120; height: 120 @@ -219,8 +219,8 @@ void QDeclarativeImagePrivate::setPixmap(const QPixmap &pixmap) \endqml \row - \o \image declarative-qtlogo-tilehorizontally.png - \o TileHorizontally + \li \image declarative-qtlogo-tilehorizontally.png + \li TileHorizontally \qml Image { width: 120; height: 120 @@ -282,22 +282,22 @@ qreal QDeclarativeImage::paintedHeight() const This property holds the status of image loading. It can be one of: \list - \o Image.Null - no image has been set - \o Image.Ready - the image has been loaded - \o Image.Loading - the image is currently being loaded - \o Image.Error - an error occurred while loading the image + \li Image.Null - no image has been set + \li Image.Ready - the image has been loaded + \li Image.Loading - the image is currently being loaded + \li Image.Error - an error occurred while loading the image \endlist Use this status to provide an update or respond to the status change in some way. For example, you could: \list - \o Trigger a state change: + \li Trigger a state change: \qml State { name: 'loaded'; when: image.status == Image.Ready } \endqml - \o Implement an \c onStatusChanged signal handler: + \li Implement an \c onStatusChanged signal handler: \qml Image { id: image @@ -305,7 +305,7 @@ qreal QDeclarativeImage::paintedHeight() const } \endqml - \o Bind to the status value: + \li Bind to the status value: \qml Text { text: image.status == Image.Ready ? 'Loaded' : 'Not loaded' } \endqml |