diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-14 08:12:44 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-12-14 08:12:44 (GMT) |
| commit | 39ca4450e0c2ca16ba253f1a3ac3ea5bdd23f290 (patch) | |
| tree | 2dfe827736f94ec7925984322829319f4cd92060 /src/corelib/tools | |
| parent | 006b48d5f998d0beba9431a7688c928f0f5f9ad6 (diff) | |
| parent | c15c9cd2356eaeba33a5f8e62a90b0aeb45284e1 (diff) | |
| download | Qt-39ca4450e0c2ca16ba253f1a3ac3ea5bdd23f290.zip Qt-39ca4450e0c2ca16ba253f1a3ac3ea5bdd23f290.tar.gz Qt-39ca4450e0c2ca16ba253f1a3ac3ea5bdd23f290.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qcache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h index ee9523f..086a52f 100644 --- a/src/corelib/tools/qcache.h +++ b/src/corelib/tools/qcache.h @@ -70,8 +70,9 @@ class QCache if (l == &n) l = n.p; if (f == &n) f = n.n; total -= n.c; + T *object = n.t; hash.remove(*n.keyPtr); - delete n.t; + delete object; } inline T *relink(const Key &key) { typename QHash<Key, Node>::iterator i = hash.find(key); |