diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-19 07:26:12 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-19 07:26:12 (GMT) |
| commit | 6871d82c0f9c62d6b7bf0312324b51a4fbdf720c (patch) | |
| tree | 8dd246870424e54a43bc028205544e7634bc4d60 /src/declarative | |
| parent | b988ef5a3d9ac96cfa7b9fd4b87522bbab84ffce (diff) | |
| parent | 5ef574960981066c50b390daf4e8fc45b6fe9f83 (diff) | |
| download | Qt-6871d82c0f9c62d6b7bf0312324b51a4fbdf720c.zip Qt-6871d82c0f9c62d6b7bf0312324b51a4fbdf720c.tar.gz Qt-6871d82c0f9c62d6b7bf0312324b51a4fbdf720c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qmlpixmapcache.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp index 21fce5e..56903ce 100644 --- a/src/declarative/util/qmlpixmapcache.cpp +++ b/src/declarative/util/qmlpixmapcache.cpp @@ -267,12 +267,12 @@ QmlImageReader::QmlImageReader(QmlEngine *eng) QmlImageReader::~QmlImageReader() { - quit(); - wait(); readerMutex.lock(); readers.remove(engine); readerMutex.unlock(); - delete handler; + + quit(); + wait(); } QmlImageReader *QmlImageReader::instance(QmlEngine *engine) @@ -335,6 +335,9 @@ void QmlImageReader::run() handler = new QmlImageRequestHandler(this, engine); exec(); + + delete handler; + handler = 0; } //=========================================================================== |