From 8b2028741810f0738eec7d4caf2bc050f47d15b7 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 24 Jul 2013 17:50:47 +0200 Subject: [PATCH] QmlDesigner: Return items instead of object for defaultPropertyChildren Change-Id: I39a4698c187180c8a954e64a44938b1e3bb910fc Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/designercore/include/qmlitemnode.h | 2 +- src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index 745fa80ec9e..1c1a51e452f 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -59,7 +59,7 @@ public: QmlModelStateGroup states() const; QList children() const; QList resources() const; - QList defaultPropertyChildren() const; + QList defaultPropertyChildren() const; QList allDirectSubNodes() const; QmlAnchors anchors() const; diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp index 4a2bd05b3ea..ed5eb405f09 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp @@ -131,7 +131,7 @@ QList QmlItemNode::resources() const return toQmlObjectNodeList(resourcesList); } -QList QmlItemNode::defaultPropertyChildren() const +QList QmlItemNode::defaultPropertyChildren() const { QList defaultPropertyChildrenList; @@ -140,7 +140,7 @@ QList QmlItemNode::defaultPropertyChildren() const defaultPropertyChildrenList.append(modelNode().nodeListProperty(defaultPropertyName()).toModelNodeList()); } - return toQmlObjectNodeList(defaultPropertyChildrenList); + return toQmlItemNodeList(defaultPropertyChildrenList); } QList QmlItemNode::allDirectSubNodes() const