From: Simon Hausmann <simon.hausmann@digia.com>
Date: Wed, 26 Feb 2014 10:48:50 +0000 (+0100)
Subject: [new compiler] Fix remaining qquickanimation test failures
X-Git-Tag: upstream/5.2.90+alpha~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=850a50bb115e6fa6ca3cc32cb2f110a0b70e7a36;p=platform%2Fupstream%2Fqtdeclarative.git

[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>
---

diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index cce7ccf77..ac70cb2c1 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");