diff options
author | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:00:42 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-12-06 18:00:42 (GMT) |
commit | 34bfad76d1afe4a0ee27496e740c8566387dc16c (patch) | |
tree | c4304699a1a2d4a729bddfb3102a5ba3ad9a2cd8 /src/declarative/util/qdeclarativepixmapcache.cpp | |
parent | 16c3df54960b776f35f59288b888e829e7e81002 (diff) | |
parent | 608b66b5af75ae6982be428439eea735c00cc455 (diff) | |
download | Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.zip Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.gz Qt-34bfad76d1afe4a0ee27496e740c8566387dc16c.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativepixmapcache.cpp')
-rw-r--r-- | src/declarative/util/qdeclarativepixmapcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index a07b1bb..380d9bc 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -684,7 +684,7 @@ void QDeclarativePixmapStore::timerEvent(QTimerEvent *) } QDeclarativePixmapReply::QDeclarativePixmapReply(QDeclarativePixmapData *d) -: data(d), reader(0), loading(false), redirectCount(0), requestSize(d->requestSize) +: data(d), reader(0), requestSize(d->requestSize), loading(false), redirectCount(0) { if (finishedIndex == -1) { finishedIndex = QDeclarativePixmapReply::staticMetaObject.indexOfSignal("finished()"); |