diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-07-08 03:19:22 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-07-08 04:07:39 (GMT) |
| commit | a258456bcb35ec4211751a702ea94a1881d82a07 (patch) | |
| tree | ca7dc7ded5b23aac34247694a06a9bf910e2384e /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | 3d8db76427efd74e1668b2743381d724453da5d6 (diff) | |
| download | Qt-a258456bcb35ec4211751a702ea94a1881d82a07.zip Qt-a258456bcb35ec4211751a702ea94a1881d82a07.tar.gz Qt-a258456bcb35ec4211751a702ea94a1881d82a07.tar.bz2 | |
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
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index cfa9d73..f457b53 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -64,6 +64,7 @@ #include "qdeclarativecontext.h" #include "private/qdeclarativecontext_p.h" #include "qdeclarativeexpression.h" +#include "qdeclarativeimageprovider.h" #include "private/qdeclarativeproperty_p.h" #include "private/qdeclarativepropertycache_p.h" #include "private/qdeclarativeobjectscriptclass_p.h" @@ -233,7 +234,9 @@ public: mutable QDeclarativeNetworkAccessManagerFactory *networkAccessManagerFactory; QHash<QString,QDeclarativeImageProvider*> imageProviders; + QDeclarativeImageProvider::ImageType getImageProviderType(const QUrl &url); QImage getImageFromProvider(const QUrl &url, QSize *size, const QSize& req_size); + QPixmap getPixmapFromProvider(const QUrl &url, QSize *size, const QSize& req_size); mutable QMutex mutex; |