diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 16:06:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 16:06:23 (GMT) |
| commit | f707672eb4c51ea82fbd98e1da16ece61a74c690 (patch) | |
| tree | f276d6ae14986b29cf29da411691b57d3dd47a89 /src/declarative/util | |
| parent | 1c3fa677ee494f8982c99b468b4a4fcad8aa04c7 (diff) | |
| parent | 14de8cecfa5b5428d597c9cca111ee0f3f89502f (diff) | |
| download | Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.zip Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.tar.gz Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativepixmapcache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 5190eab..9221d78 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -426,7 +426,8 @@ void QDeclarativePixmapReader::processJobs() replies.remove(reply); reply->close(); } - delete job; + // deleteLater, since not owned by this thread + job->deleteLater(); } cancelled.clear(); } |