diff options
| author | axis <qt-info@nokia.com> | 2009-12-16 08:37:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-16 08:37:34 (GMT) |
| commit | 6e527912d719b0448b91eba1d6a99b9cbe58170a (patch) | |
| tree | 17ba94b2af34ba2ab953fbd7be84955bdea39370 /src/corelib/tools | |
| parent | 8152bd167c1a728c54a9976297bb53e09d131d66 (diff) | |
| parent | a9d4faa330698a7972c7fa4b3582fb20548b32f6 (diff) | |
| download | Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.zip Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.gz Qt-6e527912d719b0448b91eba1d6a99b9cbe58170a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qcache.h | 3 | ||||
| -rw-r--r-- | src/corelib/tools/qregexp.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h index 46e20b1..66f9f73 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; - delete n.t; + T *obj = n.t; hash.remove(*n.keyPtr); + delete obj; } inline T *relink(const Key &key) { typename QHash<Key, Node>::iterator i = hash.find(key); diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 2bad40e..8a46b98 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -119,7 +119,9 @@ public: #endif int matchedLength() const; #ifndef QT_NO_REGEXP_CAPTURE +#ifdef QT_DEPRECATED QT_DEPRECATED int numCaptures() const; +#endif int captureCount() const; QStringList capturedTexts() const; QStringList capturedTexts(); |