diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:17:46 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:17:46 +0200 |
commit | 7224dd977163335d61ed4297341e6161bf1dbcf7 (patch) | |
tree | 1674bfdd872ba45908437c9cbc67ba98f5f3b534 /src/quick/util/qquickimageprovider.cpp | |
parent | c704226b6815df4d989142729bae9fadd14f6f9d (diff) | |
parent | f3973cbd077d2d92250958f8bda57fea30827f00 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I35f07a1725af104952f822274763dd7a96a9d560
Diffstat (limited to 'src/quick/util/qquickimageprovider.cpp')
-rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index abdadaa5d3..4906645f6c 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -242,7 +242,7 @@ QImage QQuickTextureFactory::image() const \c cache property to \c false for the relevant \l Image, \l BorderImage or \l AnimatedImage object. - The QtQuick 1 version of this class is named QDeclarativeImageProvider. + The \l {Qt Quick 1} version of this class is named QDeclarativeImageProvider. \sa QQmlEngine::addImageProvider() */ |