diff options
Diffstat (limited to 'src/declarative/fx/qfxpixmap.cpp')
-rw-r--r-- | src/declarative/fx/qfxpixmap.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxpixmap.cpp b/src/declarative/fx/qfxpixmap.cpp index 3fdd8e5..0e5a10f 100644 --- a/src/declarative/fx/qfxpixmap.cpp +++ b/src/declarative/fx/qfxpixmap.cpp @@ -275,15 +275,18 @@ QNetworkReply *QFxPixmap::get(QmlEngine *engine, const QUrl& url, QObject* obj, /*! Stops the given slot being invoked if the given url finishes loading. May also cancel loading (eg. if no other pending request). + + Any connections to the QNetworkReply returned by get() will be + disconnected. */ -void QFxPixmap::cancelGet(const QUrl& url, QObject* obj, const char* slot) +void QFxPixmap::cancelGet(const QUrl& url, QObject* obj) { QString key = url.toString(); QFxPixmapCache::Iterator iter = qfxPixmapCache.find(key); if (iter == qfxPixmapCache.end()) return; if ((*iter)->reply) - QObject::disconnect((*iter)->reply, SIGNAL(finished()), obj, slot); + QObject::disconnect((*iter)->reply, 0, obj, 0); // XXX - loading not cancelled. Need to revisit caching } |