summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndy Shaw <qt-info@nokia.com>2009-05-11 11:28:44 (GMT)
committerAndy Shaw <qt-info@nokia.com>2009-05-11 11:28:44 (GMT)
commitcd797602535967f97584957333bb5825430e58cc (patch)
treee5bf93656a122c4c0227355635145a48b8da829b /src
parent90cf2f668136f32832405a17f355ab405882a99d (diff)
parent61ba9b2a920fd561b292886b3b75bfde4847e26f (diff)
downloadQt-cd797602535967f97584957333bb5825430e58cc.zip
Qt-cd797602535967f97584957333bb5825430e58cc.tar.gz
Qt-cd797602535967f97584957333bb5825430e58cc.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src')
-rw-r--r--src/script/qscriptvalueiterator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/qscriptvalueiterator.cpp b/src/script/qscriptvalueiterator.cpp
index fe5ef9f..1a60632 100644
--- a/src/script/qscriptvalueiterator.cpp
+++ b/src/script/qscriptvalueiterator.cpp
@@ -106,6 +106,7 @@ QScriptValueIteratorPrivate::QScriptValueIteratorPrivate()
*/
QScriptValueIteratorPrivate::~QScriptValueIteratorPrivate()
{
+ delete it;
}
/*!
@@ -130,7 +131,6 @@ QScriptValueIterator::QScriptValueIterator(const QScriptValue &object)
QScriptValueIterator::~QScriptValueIterator()
{
if (d_ptr) {
- delete d_ptr->it;
delete d_ptr;
d_ptr = 0;
}
@@ -312,7 +312,7 @@ void QScriptValueIterator::remove()
QScriptValueIterator& QScriptValueIterator::operator=(QScriptValue &object)
{
if (d_ptr) {
- delete d_ptr->it;
+ delete d_ptr;
d_ptr = 0;
}
QScriptValueImpl val = QScriptValuePrivate::valueOf(object);