diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-26 11:43:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-02 14:49:06 +0100 |
| commit | 518860e1d7b3a28fe43fed653886e45d97ee7b5d (patch) | |
| tree | 285c915bf0fe8e4833019b879a6591149248a8e3 /src/qml/qml/qqmlobjectcreator.cpp | |
| parent | 849de77470ca81bc97a547af28c4caa3b8a84078 (diff) | |
[new compiler] Fix qquickanimation test crash
Share finalization callbacks across all sub-instances of ObjectCreator,
by moving into into SharedState.
Change-Id: Ibcd679caecd2009b4705d04c859b2fea4c2295fd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index f11b383653..cce7ccf77e 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -1089,15 +1089,15 @@ QQmlContextData *QQmlObjectCreator::finalize(QQmlInstantiationInterrupt &interru { QQmlTrace trace("VME Finalize Callbacks"); - for (int ii = 0; ii < finalizeCallbacks.count(); ++ii) { - QQmlEnginePrivate::FinalizeCallback callback = finalizeCallbacks.at(ii); + for (int ii = 0; ii < sharedState->finalizeCallbacks.count(); ++ii) { + QQmlEnginePrivate::FinalizeCallback callback = sharedState->finalizeCallbacks.at(ii); QObject *obj = callback.first; if (obj) { void *args[] = { 0 }; QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod, callback.second, args); } } - finalizeCallbacks.clear(); + sharedState->finalizeCallbacks.clear(); } { |