Extend QDeclarativeImageProvider to support QPixmap loading and

synchronous loading of QImages. (QPixmaps can only be created in the
main thread so they will always be loaded synchronously).

This changes request() to requestImage() and adds requestPixmap()
for pixmap support.

Task-number: QTBUG-11989
(cherry picked from commit a258456bcb35ec4211751a702ea94a1881d82a07)

3 files changed, 4 insertions, 2 deletions

diff --git a/doc/src/declarative/pics/imageprovider.png b/doc/src/declarative/pics/imageprovider.png
new file mode 100644
index 0000000..422103c
--- /dev/null
+++ b/doc/src/declarative/pics/imageprovider.png
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index c8a7403..8896366 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -211,8 +211,10 @@
     \title C++ Extensions: Image Provider
     \example declarative/cppextensions/imageprovider
 
-    This examples shows how to use QDeclarativeImageProvider to serve images asynchronously
-    into a QML item.
+    This examples shows how to use QDeclarativeImageProvider to serve images 
+    to QML image elements.
+
+    \image qml-imageprovider-example.png
 */
 
 /*!
diff --git a/doc/src/images/qml-imageprovider-example.png b/doc/src/images/qml-imageprovider-example.png
new file mode 100644
index 0000000..e82548a
--- /dev/null
+++ b/doc/src/images/qml-imageprovider-example.png