diff options
Diffstat (limited to 'src/qml/compiler/qqmltypecompiler.cpp')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index 68de9aee44..e1166286c2 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -1078,7 +1078,7 @@ QQmlComponentAndAliasResolver::AliasResolutionResult QQmlComponentAndAliasResolv } else property = QStringRef(&aliasPropertyValue, 0, aliasPropertyValue.length()); - int propIdx = -1; + QQmlPropertyIndex propIdx; if (property.isEmpty()) { alias->flags |= QV4::CompiledData::Alias::AliasPointsToPointerObject; @@ -1121,7 +1121,7 @@ QQmlComponentAndAliasResolver::AliasResolutionResult QQmlComponentAndAliasResolv break; } - propIdx = targetProperty->coreIndex; + propIdx = QQmlPropertyIndex(targetProperty->coreIndex); if (!subProperty.isEmpty()) { const QMetaObject *valueTypeMetaObject = QQmlValueTypeFactory::metaObjectForMetaType(targetProperty->propType); @@ -1138,14 +1138,14 @@ QQmlComponentAndAliasResolver::AliasResolutionResult QQmlComponentAndAliasResolv } Q_ASSERT(valueTypeIndex <= 0x0000FFFF); - propIdx = QQmlPropertyData::encodeValueTypePropertyIndex(propIdx, valueTypeIndex); + propIdx = QQmlPropertyIndex(propIdx.coreIndex(), valueTypeIndex); } else { if (targetProperty->isQObject()) alias->flags |= QV4::CompiledData::Alias::AliasPointsToPointerObject; } } - alias->encodedMetaPropertyIndex = propIdx; + alias->encodedMetaPropertyIndex = propIdx.toEncoded(); alias->flags |= QV4::CompiledData::Alias::Resolved; numResolvedAliases++; } |