diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-04-12 04:45:51 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-04-12 04:45:51 (GMT) |
| commit | 1e3b3551b8498e1f4dc92982e2a040ba90a6bf26 (patch) | |
| tree | dee1f64c3a9e26e07bc9cea00b90e800b932a6f2 /src/script/api/qscriptprogram.cpp | |
| parent | 20a00436174faf746be14f5c36908710eeb44101 (diff) | |
| parent | 381ea9c22eb8f6b3701376a650202f094e17746d (diff) | |
| download | Qt-1e3b3551b8498e1f4dc92982e2a040ba90a6bf26.zip Qt-1e3b3551b8498e1f4dc92982e2a040ba90a6bf26.tar.gz Qt-1e3b3551b8498e1f4dc92982e2a040ba90a6bf26.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/declarative/javascriptblocks.qdoc
Diffstat (limited to 'src/script/api/qscriptprogram.cpp')
| -rw-r--r-- | src/script/api/qscriptprogram.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp index 8d4de11..02beba4 100644 --- a/src/script/api/qscriptprogram.cpp +++ b/src/script/api/qscriptprogram.cpp @@ -63,6 +63,10 @@ QScriptProgramPrivate::QScriptProgramPrivate(const QString &src, QScriptProgramPrivate::~QScriptProgramPrivate() { + if (engine) { + QScript::APIShim shim(engine); + _executable.clear(); + } } QScriptProgramPrivate *QScriptProgramPrivate::get(const QScriptProgram &q) |