diff options
| author | Michael Brasser <mbrasser@ford.com> | 2017-01-30 16:36:46 -0600 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-02-03 07:41:36 +0000 |
| commit | 89f8c55b6f89c26578b7be9f4db35d0b2ef75a67 (patch) | |
| tree | adb2abc4e74fe3c0da20325f263a1ce8e01b2c40 /src | |
| parent | 533f9591595c3933ac56a3b3f4422a8aa821cb00 (diff) | |
Enable PropertyChanges to correctly restore binding on alias
Change-Id: I88ffdd1d1224705e980e449b6c799c9f186143b1
Task-number: QTBUG-58271
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 22b03fd6d3efdfa0385ced2450c6c7dfcf555d6e)
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 1eaff6b600..8818b95f0a 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -791,12 +791,12 @@ void QQmlPropertyPrivate::removeBinding(const QQmlProperty &that) QQmlAbstractBinding * QQmlPropertyPrivate::binding(QObject *object, int index) { + findAliasTarget(object, index, &object, &index); + QQmlData *data = QQmlData::get(object); if (!data) return 0; - findAliasTarget(object, index, &object, &index); - int coreIndex; int valueTypeIndex = QQmlPropertyData::decodeValueTypePropertyIndex(index, &coreIndex); |