diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-01 15:08:17 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-02 15:13:39 +0200 |
| commit | 9693bfc546a5ba40f1756d61eb41b0beccbf8432 (patch) | |
| tree | f4eb61cae5e6f4d555f914295ca50c5642134d5c /src/qml/qml/qqmlvme.cpp | |
| parent | b32da633e09feeabc336efe54faa2a8c55b6abb4 (diff) | |
Fix missing object markings in QV4::Script
Store the qml activation object as Persistent value, as the script object is
often stored on the heap. Also make sure to mark it in QmlBindingWrapper. Fixes
various valgrind errors in tst_qqmlecmascript.
Change-Id: I7edf1e18db0e6a5ab9dcbfd57e258d72fe62cd77
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index 1fc9a7eee0..f12f5dd5bf 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -1159,7 +1159,7 @@ QV4::PersistentValue QQmlVME::run(QQmlContextData *parentCtxt, QQmlScriptData *s QV4::ExecutionContext *ctx = QV8Engine::getV4(v8engine)->current; try { - script->m_program->qml = qmlglobal.asObject(); + script->m_program->qml = qmlglobal; script->m_program->run(); } catch (QV4::Exception &e) { e.accept(ctx); |