summaryrefslogtreecommitdiffstats
path: root/src/script/qscriptvalueiterator.cpp
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2009-05-18 12:56:44 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2009-05-18 12:56:44 (GMT)
commit181dc3984ddf1445d85d085f82c7d14f2fc08519 (patch)
tree6c728d05d54ae91548fa7493682faa3c4c4fc662 /src/script/qscriptvalueiterator.cpp
parent37930d767ad67912b58332a87b6b6efc942a3082 (diff)
parent6e81bfbaf69864a06240835e0b30cdc47a2668b7 (diff)
downloadQt-181dc3984ddf1445d85d085f82c7d14f2fc08519.zip
Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.tar.gz
Qt-181dc3984ddf1445d85d085f82c7d14f2fc08519.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/script/qscriptvalueiterator.cpp')
-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);