diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-08-15 09:50:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 13:33:45 +0200 |
| commit | ecc432a5b7ae269220f86c6f0b3dd364f8643191 (patch) | |
| tree | 66c9f0ecc280d9b71e677266f533ce9edafa0f94 /src/script/api | |
| parent | 3414828ccc91da0d94f3b160f29766b9273357ad (diff) | |
| download | qt4-tools-ecc432a5b7ae269220f86c6f0b3dd364f8643191.tar.gz | |
Delete JS-owned QML objects right away in the engine dtor.
This prevents memory leaks when the engine is destroyed after exec()
has already finished. In most cases this happens during application
shutdown, at which point the event loop is never entered again.
Task-number: QTBUG-20377
Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/script/api')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 3 | ||||
| -rw-r--r-- | src/script/api/qscriptengine_p.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index d82108496e..cebbe0e583 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -962,7 +962,7 @@ QScriptEnginePrivate::QScriptEnginePrivate() qobjectPrototype(0), qmetaobjectPrototype(0), variantPrototype(0), activeAgent(0), agentLineNumber(-1), registeredScriptValues(0), freeScriptValues(0), freeScriptValuesCount(0), - registeredScriptStrings(0), processEventsInterval(-1), inEval(false) + registeredScriptStrings(0), processEventsInterval(-1), inEval(false), inDestructor(false) { qMetaTypeId<QScriptValue>(); qMetaTypeId<QList<int> >(); @@ -1015,6 +1015,7 @@ QScriptEnginePrivate::QScriptEnginePrivate() QScriptEnginePrivate::~QScriptEnginePrivate() { + inDestructor = true; QScript::APIShim shim(this); //disconnect all loadedScripts and generate all jsc::debugger::scriptUnload events diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index 6a023d7b94..8a7037b002 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -382,6 +382,7 @@ public: int processEventsInterval; QScriptValue abortResult; bool inEval; + bool inDestructor; JSC::UString cachedTranslationUrl; JSC::UString cachedTranslationContext; |