summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengineagent.cpp
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-21 14:29:28 (GMT)
committeraxis <qt-info@nokia.com>2009-08-21 14:29:28 (GMT)
commite190e700d707c3000f813c106c27d8f5aeda44d0 (patch)
tree63fa8d66040ca5680b0a1b3d108a17ec2139f1e9 /src/script/api/qscriptengineagent.cpp
parent71a8a5c97315c114d55190594a7175552bfd41a6 (diff)
parentae42be87658ad97fad48706141779ec42c02212e (diff)
downloadQt-e190e700d707c3000f813c106c27d8f5aeda44d0.zip
Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.gz
Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.bz2
Merge branch 'master' of git@scm:qt/qt-s60-public
This brings support for the S60 platform into Qt.
Diffstat (limited to 'src/script/api/qscriptengineagent.cpp')
-rw-r--r--src/script/api/qscriptengineagent.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp
index 6417ed8..b18f29d 100644
--- a/src/script/api/qscriptengineagent.cpp
+++ b/src/script/api/qscriptengineagent.cpp
@@ -230,9 +230,7 @@ QScriptEngineAgent::QScriptEngineAgent(QScriptEngineAgentPrivate &dd, QScriptEng
*/
QScriptEngineAgent::~QScriptEngineAgent()
{
- d_ptr->engine->agentDeleted(this);
- delete d_ptr;
- d_ptr = 0;
+ d_ptr->engine->agentDeleted(this); //### TODO: Can this throw?
}
/*!