diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-26 11:48:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-02 14:49:11 +0100 |
| commit | 850a50bb115e6fa6ca3cc32cb2f110a0b70e7a36 (patch) | |
| tree | 74a82d1ecd7e21ef05bc41cc04dd84d93a48c015 /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | 518860e1d7b3a28fe43fed653886e45d97ee7b5d (diff) | |
[new compiler] Fix remaining qquickanimation test failures
It can happen that even during initial binding evaluation, additional
finalization callbacks are registered. Catch those by setting the
activeObjectCreator pointer in the QQmlEngine accordingly - the VME does
it the same way.
Change-Id: If0fc902a4c8bdf7e8eec17bf433fd2bf11be7c04
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index cce7ccf77e..ac70cb2c16 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -1052,6 +1052,8 @@ QObject *QQmlObjectCreator::createInstance(int index, QObject *parent) QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interrupt) { + ActiveOCRestorer ocRestorer(this, QQmlEnginePrivate::get(engine)); + { QQmlTrace trace("VME Binding Enable"); trace.event("begin binding eval"); |