summaryrefslogtreecommitdiffstats
path: root/src/script/qscriptvalueiterator.cpp
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
commitcc957f4cb1a8dce2fb1eb406f54ccecb4092d238 (patch)
tree5463704092728f10a58931fba7a2a74fa71f73d0 /src/script/qscriptvalueiterator.cpp
parentf14620878beed97c85c4b6a03a38f485800328d1 (diff)
parent8c0cdfdd4772e81164d838b9549e8c554ecf5966 (diff)
downloadQt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.zip
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.gz
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
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);