summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorNorwegian Rock Cat <qt-info@nokia.com>2009-05-11 15:03:50 (GMT)
committerNorwegian Rock Cat <qt-info@nokia.com>2009-05-11 15:03:50 (GMT)
commit13f8c2f8772a3fda37f6608e7400398ed88ee1d5 (patch)
tree512cdcbb78e8832cfab05b22b796769c31ca1c5f /src/script
parent54906e67f05e733f363a30dc35ec3a2624cc743d (diff)
parent8e95dc0968c7660410db954c13545667dbea8ad7 (diff)
downloadQt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.zip
Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.tar.gz
Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.tar.bz2
Merge branches 'master' and 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/script')
-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);