diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 03:43:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 03:43:27 (GMT) |
| commit | 14de8cecfa5b5428d597c9cca111ee0f3f89502f (patch) | |
| tree | 1106e55230630e9c801079280cc674ade9bfc625 /src/declarative/util | |
| parent | 56ca8ea340aa55071c7d616e421d67a3d3622058 (diff) | |
| parent | 538a415b8296db36355609d6e84137b9354967a7 (diff) | |
| download | Qt-14de8cecfa5b5428d597c9cca111ee0f3f89502f.zip Qt-14de8cecfa5b5428d597c9cca111ee0f3f89502f.tar.gz Qt-14de8cecfa5b5428d597c9cca111ee0f3f89502f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add missing test file.
Changing width of RTL positioner doesn't relayout
Fix TextInput auto test failure on mac.
PinchArea and Flickable don't work well enough together
Fix auto test failure.
Once Image sourceSize is set there is no way to clear it.
Rotation transform with NaN angle can cause crash
Canceling image download while reading causes crash
Fix width of TextInput micro focus rectangle.
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(); } |