aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4engine.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-09-12 09:55:25 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-09-12 09:56:04 +0200
commit29316abe1ad363179cfc2eefe31d085131d1dfd7 (patch)
tree4f1248046acb0a87de7f8762ec98de3fbc9f47f1 /src/qml/jsruntime/qv4engine.cpp
parentbde8c3cd9583ed9f3bdfc36a8699f56db20a6928 (diff)
parent47b3b1b10246cad6709c0cd99f02208dbaf6b7c0 (diff)
Merge remote-tracking branch 'origin/5.10' into wip/new-backend
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r--src/qml/jsruntime/qv4engine.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 531bfa3737..d10fd78973 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -930,10 +930,13 @@ void ExecutionEngine::markObjects(MarkStack *markStack)
}
classPool->markObjects(markStack);
+ markStack->drain();
for (QSet<CompiledData::CompilationUnit*>::ConstIterator it = compilationUnits.constBegin(), end = compilationUnits.constEnd();
- it != end; ++it)
+ it != end; ++it) {
(*it)->markObjects(markStack);
+ markStack->drain();
+ }
}
ReturnedValue ExecutionEngine::throwError(const Value &value)