diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-28 23:18:16 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-28 23:18:16 (GMT) |
| commit | bd0e2aa6c99747551966fb787ea86c21f426a791 (patch) | |
| tree | 8c3de7b8aa0cf856633934f3df5adaa2bdcd0d7a /src/declarative/qml/qdeclarativeimageprovider.cpp | |
| parent | 0a114cf91058e215f4b6f8bbea09aa9e9ad57069 (diff) | |
| parent | 6cce231a2d8da6fb232908a8c815ba3a433cfad7 (diff) | |
| download | Qt-bd0e2aa6c99747551966fb787ea86c21f426a791.zip Qt-bd0e2aa6c99747551966fb787ea86c21f426a791.tar.gz Qt-bd0e2aa6c99747551966fb787ea86c21f426a791.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
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. */ |