1 files changed, 51 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index f89608cd5d..d2e9d36d55 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -82,6 +82,7 @@ QQmlObjectCreator::QQmlObjectCreator(QQmlContextData *parentContext, const QQmlR
     , propertyCaches(&compilationUnit->propertyCaches)
     , sharedState(new QQmlObjectCreatorSharedState)
     , topLevelCreator(true)
+    , hadRequiredProperties(false)
     , incubator(incubator)
 {
     init(parentContext);
@@ -783,6 +784,23 @@ void QQmlObjectCreator::setupBindings(bool applyDeferredBindings)
 
     const QV4::CompiledData::Binding *binding = _compiledObject->bindingTable();
     for (quint32 i = 0; i < _compiledObject->nBindings; ++i, ++binding) {
+        QQmlPropertyData *const property = propertyData.at(i);
+        if (property) {
+            QQmlPropertyData* targetProperty = property;
+            if (targetProperty->isAlias()) {
+                // follow alias
+                auto target = _bindingTarget;
+                QQmlPropertyIndex originalIndex(targetProperty->coreIndex(), _valueTypeProperty ? _valueTypeProperty->coreIndex() : -1);
+                QQmlPropertyIndex propIndex;
+                QQmlPropertyPrivate::findAliasTarget(target, originalIndex, &target, &propIndex);
+                QQmlData *data = QQmlData::get(target);
+                Q_ASSERT(data && data->propertyCache);
+                targetProperty = data->propertyCache->property(propIndex.coreIndex());
+            }
+            sharedState->requiredProperties.remove(targetProperty);
+        }
+
+
         if (binding->flags & QV4::CompiledData::Binding::IsCustomParserBinding)
             continue;
 
@@ -794,8 +812,6 @@ void QQmlObjectCreator::setupBindings(bool applyDeferredBindings)
                 continue;
         }
 
-        const QQmlPropertyData *property = propertyData.at(i);
-
         if (property && property->isQList()) {
             if (property->coreIndex() != currentListPropertyIndex) {
                 void *argv[1] = { (void*)&_currentList };
@@ -1504,10 +1520,43 @@ bool QQmlObjectCreator::populateInstance(int index, QObject *instance, QObject *
     if (_compiledObject->flags & QV4::CompiledData::Object::HasDeferredBindings)
         _ddata->deferData(_compiledObjectIndex, compilationUnit, context);
 
+    for (int propertyIndex = 0; propertyIndex != _compiledObject->propertyCount(); ++propertyIndex) {
+        const QV4::CompiledData::Property* property = _compiledObject->propertiesBegin() + propertyIndex;
+        QQmlPropertyData *propertyData = _propertyCache->property(_propertyCache->propertyOffset() + propertyIndex);
+        if (property->isRequired) {
+            hadRequiredProperties = true;
+            sharedState->requiredProperties.insert(propertyData,
+                                                   RequiredPropertyInfo {compilationUnit->stringAt(property->nameIndex), compilationUnit->finalUrl(), property->location, {}});
+        }
+    }
+
     if (_compiledObject->nFunctions > 0)
         setupFunctions();
     setupBindings();
 
+    for (int aliasIndex = 0; aliasIndex != _compiledObject->aliasCount(); ++aliasIndex) {
+        const QV4::CompiledData::Alias* alias = _compiledObject->aliasesBegin() + aliasIndex;
+        const auto originalAlias = alias;
+        while (alias->aliasToLocalAlias)
+            alias = _compiledObject->aliasesBegin() + alias->localAliasIndex;
+        Q_ASSERT(alias->flags & QV4::CompiledData::Alias::Resolved);
+        if (!context->idValues->wasSet())
+            continue;
+        QObject *target = context->idValues[alias->targetObjectId].data();
+        if (!target)
+            continue;
+        QQmlData *targetDData = QQmlData::get(target, /*create*/false);
+        if (!targetDData)
+            continue;
+        int coreIndex = QQmlPropertyIndex::fromEncoded(alias->encodedMetaPropertyIndex).coreIndex();
+        QQmlPropertyData *const targetProperty = targetDData->propertyCache->property(coreIndex);
+        if (!targetProperty)
+            continue;
+        auto it = sharedState->requiredProperties.find(targetProperty);
+        if (it != sharedState->requiredProperties.end())
+            it->aliasesToRequired.push_back(AliasToRequiredInfo {compilationUnit->stringAt(originalAlias->nameIndex), compilationUnit->finalUrl()});
+    }
+
     qSwap(_vmeMetaObject, vmeMetaObject);
     qSwap(_bindingTarget, bindingTarget);
     qSwap(_ddata, declarativeData);