diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-28 22:57:03 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-28 22:57:03 (GMT) |
commit | a3868307c0e1584a1f694efc4a7b980b54c6e2b1 (patch) | |
tree | 54a19c5b8a357d057a8c9697b8429aed90973f60 /src/declarative/qml/qdeclarativeimageprovider.cpp | |
parent | 6b619af035a995cf16d977439995cf7c1c0d366e (diff) | |
download | Qt-a3868307c0e1584a1f694efc4a7b980b54c6e2b1.zip Qt-a3868307c0e1584a1f694efc4a7b980b54c6e2b1.tar.gz Qt-a3868307c0e1584a1f694efc4a7b980b54c6e2b1.tar.bz2 |
Source resizing for QDeclarativeImageProvider too.
(fixes test too)
Diffstat (limited to 'src/declarative/qml/qdeclarativeimageprovider.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeimageprovider.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp index 9ef8545..b992b9f 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.cpp +++ b/src/declarative/qml/qdeclarativeimageprovider.cpp @@ -61,10 +61,14 @@ QDeclarativeImageProvider::~QDeclarativeImageProvider() } /*! - \fn QImage QDeclarativeImageProvider::request(const QString &id) + \fn QImage QDeclarativeImageProvider::request(const QString &id, QSize *size, const QSize& requested_size) Implement this method to return the image with \a id. + If \a requested_size is a valid size, resize the image to that size before returning. + + In any case, \a size must be set to the (original) size of the image. + Note: this method may be called by multiple threads, so ensure the implementation of this method is reentrant. */ |