feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: fix crash while adding a delegate

Browse Source 
Change-Id: I5944332dcc741cb67be55062c5d24e293973f090
Task-number: QTCREATORBUG-19190
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2017-11-14 20:59:05 +01:00
parent 63d18a4537
commit 4969837ad6
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/model/modelnode.cpp
View File

@@ -1118,15 +1118,16 @@ bool ModelNode::isComponent() const
if (metaInfo().isView() && hasNodeProperty("delegate")) { if (metaInfo().isView() && hasNodeProperty("delegate")) {
const ModelNode delegateNode = nodeProperty("delegate").modelNode(); const ModelNode delegateNode = nodeProperty("delegate").modelNode();
if (delegateNode.isValid()) {
if (delegateNode.hasMetaInfo()) { if (delegateNode.hasMetaInfo()) {
const NodeMetaInfo delegateMetaInfo = delegateNode.metaInfo(); const NodeMetaInfo delegateMetaInfo = delegateNode.metaInfo();
if (delegateMetaInfo.isValid() && delegateMetaInfo.isFileComponent()) if (delegateMetaInfo.isValid() && delegateMetaInfo.isFileComponent())
return true; return true;
} }
if (delegateNode.nodeSourceType() == ModelNode::NodeWithComponentSource) if (delegateNode.nodeSourceType() == ModelNode::NodeWithComponentSource)
return true; return true;
} }
}
if (metaInfo().isSubclassOf("QtQuick.Loader")) { if (metaInfo().isSubclassOf("QtQuick.Loader")) {