Directly resolve property aliases in QQmlBinding::setTarget

Like this the target properties of the binding will always point
to the correct resolved object and property.

Change-Id: I400a265a17bc55de041c3df17f357e4b40f31c4d
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 0 insertions, 34 deletions

diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index 8ee4a2d98e..f003bf8c3f 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -869,23 +869,6 @@ QQmlPropertyPrivate::setBinding(QObject *object, int coreIndex, int valueTypeInd
     }
 
     if (newBinding) {
-        if (newBinding->targetPropertyIndex() != index || newBinding->targetObject() != object) {
-            QQmlData *data = QQmlData::get(object, true);
-            if (data && data->propertyCache) {
-                QQmlPropertyData propertyData = *data->propertyCache->property(coreIndex);
-                if (valueTypeIndex != -1) {
-                    const QMetaObject *valueTypeMetaObject = QQmlValueTypeFactory::metaObjectForMetaType(propertyData.propType);
-                    Q_ASSERT(valueTypeMetaObject);
-                    QMetaProperty vtProp = valueTypeMetaObject->property(valueTypeIndex);
-                    propertyData.setFlags(propertyData.getFlags() | QQmlPropertyData::IsValueTypeVirtual);
-                    propertyData.valueTypeFlags = QQmlPropertyData::flagsForProperty(vtProp);
-                    propertyData.valueTypePropType = vtProp.userType();
-                    propertyData.valueTypeCoreIndex = valueTypeIndex;
-                }
-                static_cast<QQmlBinding *>(newBinding)->setTarget(object, propertyData);
-            }
-        }
-
         Q_ASSERT(newBinding->targetPropertyIndex() == index);
         Q_ASSERT(newBinding->targetObject() == object);
 
@@ -945,23 +928,6 @@ QQmlPropertyPrivate::setBindingNoEnable(QObject *object, int coreIndex, int valu
         binding->removeFromObject();
 
     if (newBinding) {
-        if (newBinding->targetPropertyIndex() != index || newBinding->targetObject() != object) {
-            QQmlData *data = QQmlData::get(object, true);
-            if (data && data->propertyCache) {
-                QQmlPropertyData propertyData = *data->propertyCache->property(coreIndex);
-                if (valueTypeIndex != -1) {
-                    const QMetaObject *valueTypeMetaObject = QQmlValueTypeFactory::metaObjectForMetaType(propertyData.propType);
-                    Q_ASSERT(valueTypeMetaObject);
-                    QMetaProperty vtProp = valueTypeMetaObject->property(valueTypeIndex);
-                    propertyData.setFlags(propertyData.getFlags() | QQmlPropertyData::IsValueTypeVirtual);
-                    propertyData.valueTypeFlags = QQmlPropertyData::flagsForProperty(vtProp);
-                    propertyData.valueTypePropType = vtProp.userType();
-                    propertyData.valueTypeCoreIndex = valueTypeIndex;
-                }
-                static_cast<QQmlBinding *>(newBinding)->setTarget(object, propertyData);
-            }
-        }
-
         Q_ASSERT(newBinding->targetPropertyIndex() == index);
         Q_ASSERT(newBinding->targetObject() == object);