diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-19 14:40:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-24 12:39:23 +0100 |
commit | 72fffeb2c1086a8b5f5ce5b5410cd0c1da2404ac (patch) | |
tree | c62aa2f66defdd64531f252a9043dcc4f8552317 /src/qml/compiler/qqmlcodegenerator.cpp | |
parent | 065ce0b36e304c3b7c42184a2b16f969dc1226a0 (diff) |
[new compiler] Fix crash in loading qtquick controls
Don't create meta-objects for attached properties or group properties by
default.
Change-Id: Ie6263ae45e0186cf0489b45aafe4b951d336550a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qqmlcodegenerator.cpp')
-rw-r--r-- | src/qml/compiler/qqmlcodegenerator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp index 54ee0c98bd..a5bb5670be 100644 --- a/src/qml/compiler/qqmlcodegenerator.cpp +++ b/src/qml/compiler/qqmlcodegenerator.cpp @@ -1640,7 +1640,8 @@ bool SignalHandlerConverter::convertSignalHandlerExpressionsToFunctionDeclaratio if (customParser && !(customParser->flags() & QQmlCustomParser::AcceptsSignalHandlers)) continue; QQmlPropertyCache *cache = unit->propertyCaches.value(objectIndex); - Q_ASSERT(cache); + if (!cache) + continue; if (!convertSignalHandlerExpressionsToFunctionDeclarations(obj, elementName, cache)) return false; } |