aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlincubator_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2014-02-06 16:33:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-07 12:44:10 +0100
commit324ae0d7d99ef9f7159d29b2e0e7eabe5f8a43a4 (patch)
tree9576687c7580065e819392a3be6250dcf6e0c07c /src/qml/qml/qqmlincubator_p.h
parent50ce88a53107f97664d928719c1877b8077e9a2e (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/qqmlincubator_p.h')
-rw-r--r--src/qml/qml/qqmlincubator_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlincubator_p.h b/src/qml/qml/qqmlincubator_p.h
index a8b549bd28..b7009bfe43 100644
--- a/src/qml/qml/qqmlincubator_p.h
+++ b/src/qml/qml/qqmlincubator_p.h
@@ -104,8 +104,8 @@ public:
void clear();
- void forceCompletion(QQmlVME::Interrupt &i);
- void incubate(QQmlVME::Interrupt &i);
+ void forceCompletion(QQmlInstantiationInterrupt &i);
+ void incubate(QQmlInstantiationInterrupt &i);
};
QT_END_NAMESPACE