diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 10:53:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-24 10:53:22 (GMT) |
| commit | 3cc1c3120be39eb5f8598f77ebe2ca541642b1b4 (patch) | |
| tree | 48b07c1367c8ed4cf93aa34ae28bfae3e2e50ff7 /src/declarative/graphicsitems/qdeclarativeimage.cpp | |
| parent | fba03060f1bb0a7ed5a89335bb459a5e0f60078d (diff) | |
| parent | 38be1996d9fc56516cc6a27de9e582f97d05627f (diff) | |
| download | Qt-3cc1c3120be39eb5f8598f77ebe2ca541642b1b4.zip Qt-3cc1c3120be39eb5f8598f77ebe2ca541642b1b4.tar.gz Qt-3cc1c3120be39eb5f8598f77ebe2ca541642b1b4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeimage.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 9b9d680..e6bb798 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -473,7 +473,7 @@ QRectF QDeclarativeImage::boundingRect() const /*! \qmlproperty bool Image::cache - \since QtQuick 1.1 + \since Quick 1.1 Specifies whether the image should be cached. The default value is true. Setting \a cache to false is useful when dealing with large images, @@ -482,7 +482,7 @@ QRectF QDeclarativeImage::boundingRect() const /*! \qmlproperty bool Image::mirror - \since QtQuick 1.1 + \since Quick 1.1 This property holds whether the image should be horizontally inverted (effectively displaying a mirrored image). |