diff -r 5dc02b23752f -r 3e2da88830cd src/declarative/qml/qdeclarativeimageprovider.h --- a/src/declarative/qml/qdeclarativeimageprovider.h Tue Jul 06 15:10:48 2010 +0300 +++ b/src/declarative/qml/qdeclarativeimageprovider.h Wed Aug 18 10:37:55 2010 +0300 @@ -43,6 +43,7 @@ #define QDECLARATIVEIMAGEPROVIDER_H #include +#include QT_BEGIN_HEADER @@ -50,11 +51,26 @@ QT_MODULE(Declarative) +class QDeclarativeImageProviderPrivate; + class Q_DECLARATIVE_EXPORT QDeclarativeImageProvider { public: + enum ImageType { + Image, + Pixmap + }; + + QDeclarativeImageProvider(ImageType type); virtual ~QDeclarativeImageProvider(); - virtual QImage request(const QString &id, QSize *size, const QSize& requestedSize) = 0; + + ImageType imageType() const; + + virtual QImage requestImage(const QString &id, QSize *size, const QSize& requestedSize); + virtual QPixmap requestPixmap(const QString &id, QSize *size, const QSize& requestedSize); + +private: + QDeclarativeImageProviderPrivate *d; }; QT_END_NAMESPACE