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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h index c48d7d3c05..31fbbbd380 100644 --- a/src/qml/qml/qqmlobjectcreator_p.h +++ b/src/qml/qml/qqmlobjectcreator_p.h @@ -67,7 +67,7 @@ public: QQmlComponentAttached **componentAttachment() { return &sharedState->componentAttached; } - QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks; + QList<QQmlEnginePrivate::FinalizeCallback> *finalizeCallbacks() { return &sharedState->finalizeCallbacks; } QList<QQmlError> errors; @@ -96,6 +96,7 @@ private: QFiniteStack<QQmlAbstractBinding*> allCreatedBindings; QFiniteStack<QQmlParserStatus*> allParserStatusCallbacks; QQmlComponentAttached *componentAttached; + QList<QQmlEnginePrivate::FinalizeCallback> finalizeCallbacks; }; QQmlEngine *engine; |