diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-27 21:48:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-02 20:52:08 +0100 |
| commit | 189ddd88f94809942d92c2aa37b83cf65be8be4a (patch) | |
| tree | 14f53033f66922bc4385f1307f2d412bd8e88b7a /src/qml/qml/qqmlcompileddata.cpp | |
| parent | 52dc3f6937d51046424b232323189dfb41cc09c7 (diff) | |
[new compiler] Fix QQmlPropertyMap tests
QQmlPropertyMap is treated as a type that cannot be cached with QQmlPropertyCache,
doesn't allow for accelerated property access and also doesn't allow for declarations
of any kind in sub-types.
Change-Id: Id8a6811120aa61ffb5037394e758cc62501e0fc3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcompileddata.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcompileddata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcompileddata.cpp b/src/qml/qml/qqmlcompileddata.cpp index 75740e17e6..aec4553d5d 100644 --- a/src/qml/qml/qqmlcompileddata.cpp +++ b/src/qml/qml/qqmlcompileddata.cpp @@ -193,7 +193,7 @@ void QQmlCompiledData::TypeReference::doDynamicTypeCheck() mo = typePropertyCache->firstCppMetaObject(); else if (type) mo = type->metaObject(); - else + else if (component) mo = component->rootPropertyCache->firstCppMetaObject(); isFullyDynamicType = qtTypeInherits<QQmlPropertyMap>(mo); } |