diff options
| author | Michael Brasser <mbrasser@ford.com> | 2017-01-30 16:36:46 -0600 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2017-02-02 19:23:34 +0000 |
| commit | 22b03fd6d3efdfa0385ced2450c6c7dfcf555d6e (patch) | |
| tree | 153a5bfc6d7d0803ae06de684e4f4882ca0b2b6c /src | |
| parent | 9a009ccde8bfc522578533a114396a5e762d6d8f (diff) | |
Enable PropertyChanges to correctly restore binding on alias
Change-Id: I88ffdd1d1224705e980e449b6c799c9f186143b1
Task-number: QTBUG-58271
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
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 0b8eb677cb..7df8336f51 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -790,12 +790,12 @@ void QQmlPropertyPrivate::removeBinding(const QQmlProperty &that) QQmlAbstractBinding * QQmlPropertyPrivate::binding(QObject *object, QQmlPropertyIndex index) { + findAliasTarget(object, index, &object, &index); + QQmlData *data = QQmlData::get(object); if (!data) return 0; - findAliasTarget(object, index, &object, &index); - const int coreIndex = index.coreIndex(); const int valueTypeIndex = index.valueTypeIndex(); |