diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-19 03:50:43 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-19 03:50:43 (GMT) |
| commit | d363016a703f565432d2fd3d84cea4e179c79995 (patch) | |
| tree | 138b34e99a9ac11b4402a966e7e4ba395b49bee9 /src/declarative/util/qmlpixmapcache_p.h | |
| parent | 1337ed2a695e5d78cfde830f07877ff55a5b7051 (diff) | |
| download | Qt-d363016a703f565432d2fd3d84cea4e179c79995.zip Qt-d363016a703f565432d2fd3d84cea4e179c79995.tar.gz Qt-d363016a703f565432d2fd3d84cea4e179c79995.tar.bz2 | |
Add Image auto test
Also fix qmlpixmapcache error reporting and Image and BorderImage
progress reporting for null images.
Diffstat (limited to 'src/declarative/util/qmlpixmapcache_p.h')
| -rw-r--r-- | src/declarative/util/qmlpixmapcache_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlpixmapcache_p.h b/src/declarative/util/qmlpixmapcache_p.h index e6ed452..d2e272c 100644 --- a/src/declarative/util/qmlpixmapcache_p.h +++ b/src/declarative/util/qmlpixmapcache_p.h @@ -56,7 +56,7 @@ class QNetworkReply; class Q_DECLARATIVE_EXPORT QmlPixmapCache { public: - static QNetworkReply *get(QmlEngine *, const QUrl& url, QPixmap *pixmap); + static QNetworkReply *get(QmlEngine *, const QUrl& url, QPixmap *pixmap, bool *ok=0); static void cancelGet(const QUrl& url, QObject* obj); static bool find(const QUrl& url, QPixmap *pixmap); // url must have been passed to QmlPixmapCache::get, and any returned reply finished. |