aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlbinding.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-05-28 15:26:10 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-06-05 08:37:33 +0000
commitceda573e0e0e0181fc180f575616ec5cd277166e (patch)
tree9aade316b3662c03b88a8aa46cb832d638bccc43 /src/qml/qml/qqmlbinding.cpp
parent5ef5f1bb9eb282a122906d375e90632c6dcfcb35 (diff)
Fix resolving of nested alias properties
When looping to resolve nested aliases, make sure we use the correct property index to determine the vme meta object that contains the next level of alias data. Change-Id: Id2077b164a4591c86ccb63e8ed3bb997d719731c Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlbinding.cpp')
-rw-r--r--src/qml/qml/qqmlbinding.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 0f22bf4521..b5a628d7cc 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -286,8 +286,8 @@ void QQmlBinding::setTarget(QObject *object, const QQmlPropertyData &core)
}
while (pd.isAlias()) {
- int coreIndex = core.coreIndex;
- int valueTypeIndex = core.getValueTypeCoreIndex();
+ int coreIndex = pd.coreIndex;
+ int valueTypeIndex = pd.getValueTypeCoreIndex();
QQmlVMEMetaObject *vme = QQmlVMEMetaObject::getForProperty(object, coreIndex);
int aValueTypeIndex;