diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 16:08:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 22:14:45 +0200 |
| commit | 495358cb089bf1dbbbf7d83ec5c19225fb934389 (patch) | |
| tree | e044fe489bb00c4f6d10b5559bbf6df8cf55c9b9 | |
| parent | 1c29d63d6045cf9d58cbc0f850de8fa50bf75d09 (diff) | |
[new compiler] Fix binding evaluations
All created bindings are activated at finalization time and given sub-objects
they're all collected in allCreatedBindings. When populating that, make sure
to populate the right variable before the qSwap.
Change-Id: Ibf5b55aca933c062e1ffcac327214c73a2ae6348
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index c509508779..ca6fc7edf4 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -1301,6 +1301,8 @@ bool QmlObjectCreator::populateInstance(int index, QObject *instance, QQmlRefPoi setupBindings(); setupFunctions(); + allCreatedBindings.append(_createdBindings); + qSwap(_qmlContext, qmlContext); qSwap(_createdBindings, createdBindings); @@ -1310,8 +1312,6 @@ bool QmlObjectCreator::populateInstance(int index, QObject *instance, QQmlRefPoi qSwap(_compiledObject, obj); qSwap(_qobject, instance); - allCreatedBindings.append(_createdBindings); - return errors.isEmpty(); } |