diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-06 16:33:15 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 12:44:10 +0100 |
| commit | 324ae0d7d99ef9f7159d29b2e0e7eabe5f8a43a4 (patch) | |
| tree | 9576687c7580065e819392a3be6250dcf6e0c07c /src/qml/qml/qqmlcomponent.cpp | |
| parent | 50ce88a53107f97664d928719c1877b8077e9a2e (diff) | |
[new compiler] Allow for interruption during object finalization
The object tree construction and binding allocation remains synchronous, but
the initial evaluation of the bindings is now cooperatively interruptible
again, like in the VME.
Change-Id: Idd037dd481782c81ad43e20e93d922eb12ac8b85
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index bf87a9dd2d..cc7ea57602 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -914,7 +914,8 @@ void QQmlComponentPrivate::complete(QQmlEnginePrivate *enginePriv, ConstructionS { if (state->completePending) { if (enginePriv->useNewCompiler) { - state->creator->finalize(); + QQmlInstantiationInterrupt interrupt; + state->creator->finalize(interrupt); } else { state->vme.complete(); } |