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

QmlDesigner: Return items instead of object for defaultPropertyChildren

Browse Source 
Change-Id: I39a4698c187180c8a954e64a44938b1e3bb910fc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2013-07-24 17:50:47 +02:00
parent 90d4e38b36
commit 8b20287418
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/include/qmlitemnode.h
View File

@@ -59,7 +59,7 @@ public:
QmlModelStateGroup states() const; QmlModelStateGroup states() const;
QList<QmlItemNode> children() const; QList<QmlItemNode> children() const;
QList<QmlObjectNode> resources() const; QList<QmlObjectNode> resources() const;
QList<QmlObjectNode> defaultPropertyChildren() const; QList<QmlItemNode> defaultPropertyChildren() const;
QList<QmlObjectNode> allDirectSubNodes() const; QList<QmlObjectNode> allDirectSubNodes() const;
QmlAnchors anchors() const; QmlAnchors anchors() const;

4
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -131,7 +131,7 @@ QList<QmlObjectNode> QmlItemNode::resources() const
return toQmlObjectNodeList(resourcesList); return toQmlObjectNodeList(resourcesList);
} }
QList<QmlObjectNode> QmlItemNode::defaultPropertyChildren() const QList<QmlItemNode> QmlItemNode::defaultPropertyChildren() const
{ {
QList<ModelNode> defaultPropertyChildrenList; QList<ModelNode> defaultPropertyChildrenList;
@@ -140,7 +140,7 @@ QList<QmlObjectNode> QmlItemNode::defaultPropertyChildren() const
defaultPropertyChildrenList.append(modelNode().nodeListProperty(defaultPropertyName()).toModelNodeList()); defaultPropertyChildrenList.append(modelNode().nodeListProperty(defaultPropertyName()).toModelNodeList());
} }
return toQmlObjectNodeList(defaultPropertyChildrenList); return toQmlItemNodeList(defaultPropertyChildrenList);
} }
QList<QmlObjectNode> QmlItemNode::allDirectSubNodes() const QList<QmlObjectNode> QmlItemNode::allDirectSubNodes() const