diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2017-11-14 20:59:05 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2017-11-15 07:53:25 +0000 |
| commit | 4969837ad6891c31753223199169c8390fa1ed93 (patch) | |
| tree | 852ac2dfafc01ca851309f5bcf7b4e8762552ebc /src | |
| parent | 63d18a45377cac0d6f2f4f66cd5facb4817aace9 (diff) | |
QmlDesigner: fix crash while adding a delegate
Change-Id: I5944332dcc741cb67be55062c5d24e293973f090
Task-number: QTCREATORBUG-19190
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/modelnode.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp index 6f7ed9bbe7..641849d004 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp @@ -1118,14 +1118,15 @@ bool ModelNode::isComponent() const if (metaInfo().isView() && hasNodeProperty("delegate")) { const ModelNode delegateNode = nodeProperty("delegate").modelNode(); - if (delegateNode.hasMetaInfo()) { - const NodeMetaInfo delegateMetaInfo = delegateNode.metaInfo(); - if (delegateMetaInfo.isValid() && delegateMetaInfo.isFileComponent()) + if (delegateNode.isValid()) { + if (delegateNode.hasMetaInfo()) { + const NodeMetaInfo delegateMetaInfo = delegateNode.metaInfo(); + if (delegateMetaInfo.isValid() && delegateMetaInfo.isFileComponent()) + return true; + } + if (delegateNode.nodeSourceType() == ModelNode::NodeWithComponentSource) return true; } - - if (delegateNode.nodeSourceType() == ModelNode::NodeWithComponentSource) - return true; } if (metaInfo().isSubclassOf("QtQuick.Loader")) { |