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