diff options
| author | Simon Hausmann <[email protected]> | 2016-08-05 21:10:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2016-08-06 06:25:06 +0000 |
| commit | a3aad1a470dc9cb1feea7c6b3bf35f725a6b898d (patch) | |
| tree | 3c0436f3c92b7dd71875bf409b3fae17b6a43e39 /src/qml/compiler/qqmlpropertycachecreator_p.h | |
| parent | 8d1bae4c0f45ea6853d5ff63fda4f625f1e4bb83 (diff) | |
Fix restoring of local aliases from disk cache
Local aliases are always "resolved". We must be careful not to access
the same field in the union otherwise and mistake it as property index.
Change-Id: I6369cdba145a62dcdaa10d8f4ee84bfa3cbfa0e3
Reviewed-by: Lars Knoll <[email protected]>
Diffstat (limited to 'src/qml/compiler/qqmlpropertycachecreator_p.h')
| -rw-r--r-- | src/qml/compiler/qqmlpropertycachecreator_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/compiler/qqmlpropertycachecreator_p.h b/src/qml/compiler/qqmlpropertycachecreator_p.h index 557a1364f1..a1b0a14890 100644 --- a/src/qml/compiler/qqmlpropertycachecreator_p.h +++ b/src/qml/compiler/qqmlpropertycachecreator_p.h @@ -567,6 +567,9 @@ inline void QQmlPropertyCacheAliasCreator<ObjectContainer>::appendAliasPropertie const int targetObjectIndex = objectForId(component, alias->targetObjectId); Q_ASSERT(targetObjectIndex >= 0); + if (alias->aliasToLocalAlias) + continue; + if (alias->encodedMetaPropertyIndex == -1) continue; |