diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-28 15:24:18 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-28 15:35:03 +0200 |
commit | ba0899542cf03a685335bf4e02edfb377bade224 (patch) | |
tree | 554213486fd3420745da3821c3e4502e4c15830f /src/quick/util/qquickimageprovider.cpp | |
parent | 6f411ef9d460d6a4f73a455b6eec9afc2f52d305 (diff) | |
parent | 43484528552cb2ba3dc1dabfcce22ed40bf4f8db (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/doc/src/appdevguide/porting.qdoc
sync.profile
Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12
Diffstat (limited to 'src/quick/util/qquickimageprovider.cpp')
-rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index 4906645f6c..6fbba8ca2f 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -169,7 +169,7 @@ QImage QQuickTextureFactory::image() const an image provider named "colors", and the images to be loaded are "yellow" and "red", respectively: - \snippet quick/imageprovider/imageprovider-example.qml 0 + \snippet 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 @@ -180,9 +180,9 @@ QImage QQuickTextureFactory::image() const requested by the above QML. This implementation dynamically generates QPixmap images that are filled with the requested color: - \snippet quick/imageprovider/imageprovider.cpp 0 + \snippet imageprovider/imageprovider.cpp 0 \codeline - \snippet quick/imageprovider/imageprovider.cpp 1 + \snippet imageprovider/imageprovider.cpp 1 To make this provider accessible to QML, it is registered with the QML engine with a "colors" identifier: |