diff options
| author | Josh Faust <jfaust@suitabletech.com> | 2013-06-06 17:44:12 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-30 18:32:28 +0200 |
| commit | 0a29a82dfb04bafc8408e6d1843fde588b3d1b95 (patch) | |
| tree | 9bb414edcb33884aaaf42a632e29f3cee38630b9 /src | |
| parent | a166f7974b3fb24278ada361d538d66843807b4f (diff) | |
Fix crash on QV8Engine destruction
QObjects tracked by QV8Engine can end up causing bindings to execute
when the QV8Engine is being deleted, which can call through to
QV8Engine::fromVariant(). This change ensure that that is valid
while the QObjects are being destroyed.
Task-number: QTBUG-31555
Change-Id: Iaea402ff65993bb2322af403d3590653005e30fe
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index e80da46fc9..458729491d 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -188,13 +188,13 @@ QV8Engine::~QV8Engine() qPersistentDispose(m_strongReferencer); + m_qobjectWrapper.destroy(); m_jsonWrapper.destroy(); m_sequenceWrapper.destroy(); m_valueTypeWrapper.destroy(); m_variantWrapper.destroy(); m_listWrapper.destroy(); m_typeWrapper.destroy(); - m_qobjectWrapper.destroy(); m_contextWrapper.destroy(); m_stringWrapper.destroy(); |