diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
| commit | a305814f8f59f634943d8d5f8d87d2fd49891cb3 (patch) | |
| tree | 42ed4e6afecbf36af2750e2eeaed87117ab942a6 /src/declarative/util/qdeclarativepixmapcache.cpp | |
| parent | 6258fc281f5b66b2634b81a2633b117165cea7ef (diff) | |
| parent | 1337a3e031477aa4d628d01252557dee622629ff (diff) | |
| download | Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.zip Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.gz Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
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 5ef568f..7c0a7f0 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()"); |