diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:12:12 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:12:13 +0200 |
| commit | 427bee6cb616d515ae04bc47193e35e19e1b519e (patch) | |
| tree | 9b87feddefc5c07bf0f3b2c4a5d0bc2774b9f078 /src/quick/items/qquickimage.cpp | |
| parent | e1fbfc0156db55cb5d462a15e6142db097e8a61f (diff) | |
| parent | 0ea494437736c51eb089a5245f8aac551ce6f909 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Iba61035910c46627e5e1c3824757da7b3d573657
Diffstat (limited to 'src/quick/items/qquickimage.cpp')
| -rw-r--r-- | src/quick/items/qquickimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index f8323a6bc3..5df9e630db 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -153,7 +153,7 @@ QQuickImagePrivate::QQuickImagePrivate() 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}, QQuickImageProvider + \sa {Qt Quick Examples - Image Elements}, QQuickImageProvider */ QQuickImage::QQuickImage(QQuickItem *parent) @@ -288,7 +288,7 @@ void QQuickImagePrivate::setPixmap(const QQuickPixmap &pixmap) 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} + \sa {Qt Quick Examples - Image Elements} */ QQuickImage::FillMode QQuickImage::fillMode() const { |