summaryrefslogtreecommitdiffstats
path: root/src/script/bridge/qscriptactivationobject.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2010-08-24 13:09:04 (GMT)
committerGunnar Sletta <gunnar.sletta@nokia.com>2010-08-24 13:09:04 (GMT)
commitf58296de0d88f1b7f58efbabbb12a9e8afe6828c (patch)
tree436b343e8a749b3fcff47c8cab0ddcecc35cddf8 /src/script/bridge/qscriptactivationobject.cpp
parentacf678e57ed088f3e56a551cac6c7c3322005750 (diff)
parent7a5fa8af2d0c3329dd1962d6b053388a960f8305 (diff)
downloadQt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.zip
Qt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.tar.gz
Qt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/script/bridge/qscriptactivationobject.cpp')
-rw-r--r--src/script/bridge/qscriptactivationobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp
index 6a8ae56..85224d1 100644
--- a/src/script/bridge/qscriptactivationobject.cpp
+++ b/src/script/bridge/qscriptactivationobject.cpp
@@ -53,7 +53,7 @@ QScriptActivationObject::QScriptActivationObject(JSC::ExecState *callFrame, JSC:
QScriptActivationObject::~QScriptActivationObject()
{
- delete d;
+ delete d_ptr();
}
bool QScriptActivationObject::getOwnPropertySlot(JSC::ExecState* exec, const JSC::Identifier& propertyName, JSC::PropertySlot& slot)