aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-28 11:21:19 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-28 06:21:58 +0200
commit87679b3499e68957998b98bf13b6d98b3aa8b4c3 (patch)
tree4e6d613173a1e6abf5ef0afc65a615fd6b7fdbfe /src/quick/util
parentabaee0a83588f86740ea553ff7623a789b6b787a (diff)
Docs - add missing images and code, clean up sections
Includes the removal of concepts/modelviewsdata/localstorage.qdoc since that is a duplicate of the existing Local Storage module docs. Also removes classes from whatsnew.qdoc that are internal. Change-Id: I4170c1797bbec09bb67784b0b2ad67fd990365a8 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/util')
-rw-r--r--src/quick/util/qquickimageprovider.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp
index 798af57939..49ac80d310 100644
--- a/src/quick/util/qquickimageprovider.cpp
+++ b/src/quick/util/qquickimageprovider.cpp
@@ -154,7 +154,7 @@ QImage QQuickTextureFactory::image() const
an image provider named "colors", and the images to be loaded are "yellow"
and "red", respectively:
- \snippet examples/qml/cppextensions/imageprovider/imageprovider-example.qml 0
+ \snippet examples/qml/imageprovider/imageprovider-example.qml 0
When these images are loaded by QML, it looks for a matching image provider
and calls its requestImage() or requestPixmap() method (depending on its
@@ -165,9 +165,9 @@ QImage QQuickTextureFactory::image() const
requested by the above QML. This implementation dynamically
generates QPixmap images that are filled with the requested color:
- \snippet examples/qml/cppextensions/imageprovider/imageprovider.cpp 0
+ \snippet examples/qml/imageprovider/imageprovider.cpp 0
\codeline
- \snippet examples/qml/cppextensions/imageprovider/imageprovider.cpp 1
+ \snippet examples/qml/imageprovider/imageprovider.cpp 1
To make this provider accessible to QML, it is registered with the QML engine
with a "colors" identifier:
@@ -189,7 +189,7 @@ QImage QQuickTextureFactory::image() const
\image imageprovider.png
A complete example is available in Qt's
- \l {qml/cppextensions/imageprovider}{examples/qml/cppextensions/imageprovider}
+ \l {qml/imageprovider}{examples/qml/imageprovider}
directory. Note the example registers the provider via a \l{QQmlExtensionPlugin}{plugin}
instead of registering it in the application \c main() function as shown above.