Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Ica75a71062d0613e415f2433c5c22c2e251b37cd

1 files changed, 15 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index f096dfeea9..cb4bbbab77 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -859,11 +859,24 @@ bool QQmlObjectCreator::setPropertyBinding(const QQmlPropertyData *property, con
                 QQmlPropertyValueInterceptor *vi = reinterpret_cast<QQmlPropertyValueInterceptor *>(reinterpret_cast<char *>(createdSubObject) + valueInterceptorCast);
                 QObject *target = createdSubObject->parent();
 
+                if (targetCorePropertyData.isAlias()) {
+                    int propIndex;
+                    QQmlPropertyPrivate::findAliasTarget(target, targetCorePropertyData.coreIndex, &target, &propIndex);
+                    QQmlData *data = QQmlData::get(target);
+                    if (!data || !data->propertyCache) {
+                        qWarning() << "can't resolve property alias for 'on' assignment";
+                        return false;
+                    }
+                    targetCorePropertyData = *data->propertyCache->property(propIndex);
+                }
+
                 QQmlProperty prop =
                     QQmlPropertyPrivate::restore(target, targetCorePropertyData, context);
+
                 vi->setTarget(prop);
-                QQmlVMEMetaObject *mo = QQmlVMEMetaObject::get(target);
-                Q_ASSERT(mo);
+                QQmlInterceptorMetaObject *mo = QQmlInterceptorMetaObject::get(target);
+                if (!mo)
+                    mo = new QQmlInterceptorMetaObject(target, QQmlData::get(target)->propertyCache);
                 mo->registerInterceptor(prop.index(), QQmlPropertyPrivate::valueTypeCoreIndex(prop), vi);
                 return true;
             }