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

QmlDesigner.Model: Fix isComponent for Loader

Browse Source 
Loader was also interpreted as a component, but the handling
of component and sourceComponent was incorrect.

Change-Id: I5cd691ece1a29c77b52dc74785013f08d589b2eb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Thomas Hartmann
2014-08-04 14:00:01 +02:00
parent 798af5d70e
commit 316bfcaee1
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1061,9 +1061,27 @@ bool ModelNode::isComponent() const
} }
if (metaInfo().isSubclassOf("QtQuick.Loader", -1 , -1)) { if (metaInfo().isSubclassOf("QtQuick.Loader", -1 , -1)) {
if (hasNodeProperty("component")
&& nodeProperty("component").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource) if (hasNodeListProperty("component")) {
/*
* The component property should be a NodeProperty, but currently is a NodeListProperty, because
* the default property is always implcitly a NodeListProperty. This is something that has to be fixed.
*/
ModelNode componentNode = nodeListProperty("component").toModelNodeList().first();
if (componentNode.nodeSourceType() == ModelNode::NodeWithComponentSource)
return true; return true;
if (componentNode.metaInfo().isFileComponent())
return true;
}
if (hasNodeProperty("sourceComponent")) {
if (nodeProperty("sourceComponent").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource)
return true;
if (nodeProperty("sourceComponent").modelNode().metaInfo().isFileComponent())
return true;
}
if (hasVariantProperty("source")) if (hasVariantProperty("source"))
return true; return true;