diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 15:20:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 15:21:06 +0100 |
| commit | f286db98ee41a8aa71b9a65a235b6d3e265d79f4 (patch) | |
| tree | 16e17d4c52d35f7e55fc2103db5c96850e9bdfff /examples | |
| parent | ce093497f2d4164fa8abc06cf976f9e36798e11e (diff) | |
| parent | b60a5dc9405ce89d7a742abc81b906d5c8cf5f7d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/imageprovider/doc/src/imageprovider.qdoc | 1 | ||||
| -rw-r--r-- | examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/examples/quick/imageprovider/doc/src/imageprovider.qdoc b/examples/quick/imageprovider/doc/src/imageprovider.qdoc index ba4817ca0f..f848e03fcd 100644 --- a/examples/quick/imageprovider/doc/src/imageprovider.qdoc +++ b/examples/quick/imageprovider/doc/src/imageprovider.qdoc @@ -27,6 +27,7 @@ /*! \title C++ Extensions: Image Provider Example + \brief How to load images in QML with QQuickImageProvider. \example imageprovider This examples shows how to use QQuickImageProvider to serve images diff --git a/examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc b/examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc index afe1d406d8..a883ee1f2e 100644 --- a/examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc +++ b/examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc @@ -28,6 +28,8 @@ /*! \title C++ Extensions: Image Response Provider Example \example imageresponseprovider + \brief How to load images asynchronously in QML. + This examples shows how to use QQuickImageProvider to serve images asynchronously to QML image elements. |