diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-27 23:00:12 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-27 23:00:12 (GMT) |
| commit | 8080417e0e264fdf3ccf3bb0806e14d0d480202b (patch) | |
| tree | 35ac3a796470ac5e3649dc6061a9c2e1e612b3ea /src/declarative/util | |
| parent | 6f7d60f5a0ee04c6e2f1cd21968c66f96465d52a (diff) | |
| parent | 220d13f0e83f9a70e69d95cb78711fec309e83cc (diff) | |
| download | Qt-8080417e0e264fdf3ccf3bb0806e14d0d480202b.zip Qt-8080417e0e264fdf3ccf3bb0806e14d0d480202b.tar.gz Qt-8080417e0e264fdf3ccf3bb0806e14d0d480202b.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/util')
| -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()"); |