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.h | |
| 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.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeimageprovider.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h index 6ee7bcf..50b73fe 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.h +++ b/src/declarative/qml/qdeclarativeimageprovider.h @@ -54,7 +54,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeImageProvider { public: virtual ~QDeclarativeImageProvider(); - virtual QImage request(const QString &id) = 0; + virtual QImage request(const QString &id, QSize *size, const QSize& requested_size) = 0; }; QT_END_NAMESPACE |