diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-03 08:39:08 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-03 08:39:08 (GMT) |
| commit | e1ef51cdddf4187ab68d09f42438e45a6bbf85f4 (patch) | |
| tree | e1a59bdb9e3695f43064b6fa7f6ab33d5ef359ca /src/script/api/qscriptengine.cpp | |
| parent | b495786061febf5e4c6baddbd6443f44f142c627 (diff) | |
| parent | 82a63405863f527028302ceaeff957f9ee5176e2 (diff) | |
| download | Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.zip Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.gz Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index dc0e0d0..b6aa872 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1101,16 +1101,6 @@ void QScriptEnginePrivate::mark(JSC::MarkStack& markStack) } } -#ifndef QT_NO_QOBJECT - { - QHash<QObject*, QScript::QObjectData*>::const_iterator it; - for (it = m_qobjectData.constBegin(); it != m_qobjectData.constEnd(); ++it) { - QScript::QObjectData *qdata = it.value(); - qdata->mark(markStack); - } - } -#endif - { QHash<int, QScriptTypeInfo*>::const_iterator it; for (it = m_typeInfos.constBegin(); it != m_typeInfos.constEnd(); ++it) { @@ -1134,6 +1124,17 @@ void QScriptEnginePrivate::mark(JSC::MarkStack& markStack) context = context->parentContext(); } } + +#ifndef QT_NO_QOBJECT + markStack.drain(); // make sure everything is marked before marking qobject data + { + QHash<QObject*, QScript::QObjectData*>::const_iterator it; + for (it = m_qobjectData.constBegin(); it != m_qobjectData.constEnd(); ++it) { + QScript::QObjectData *qdata = it.value(); + qdata->mark(markStack); + } + } +#endif } bool QScriptEnginePrivate::isCollecting() const |