diff options
| author | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
|---|---|---|
| committer | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
| commit | 8335adf60299b728c0bf7a346a5afd94a3d56712 (patch) | |
| tree | a8057969ac369ddffec9fa2b92e10cdf1fc319eb /src/declarative/graphicsitems/qdeclarativeimage.cpp | |
| parent | 0948de26bca9a68a354b436895bdf9e2db9c4288 (diff) | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| download | Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.zip Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.gz Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.bz2 | |
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeimage.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 94240c2..ec08517 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -83,6 +83,8 @@ QT_BEGIN_NAMESPACE 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. + + \sa {declarative/imageelements/image}{Image example} */ /*! @@ -95,7 +97,7 @@ QT_BEGIN_NAMESPACE Image { source: "pics/star.png" } \endqml - A QDeclarativeImage object can be instantiated in Qml using the tag \l Image. + A QDeclarativeImage object can be instantiated in QML using the tag \l Image. */ QDeclarativeImage::QDeclarativeImage(QDeclarativeItem *parent) |