diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2013-07-24 17:48:04 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@digia.com> | 2013-07-25 17:29:27 +0200 |
| commit | 90d4e38b36e27dea54f98fb2340d39cc8e7a55b4 (patch) | |
| tree | b5f013ca6391d1aa1ad4a59e295d923127114b0d /src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | |
| parent | 4aac7343a4938c2017f026942b5edf38f43d1e4b (diff) | |
| download | qt-creator-90d4e38b36e27dea54f98fb2340d39cc8e7a55b4.tar.gz | |
QmlDesigner: Change defaultProperty in defaultPropertyName
Change-Id: Ic00fb37878c552e8b0bb9137a2985e9af3ca7ddc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp index 2b1cdf054d..cfbf43737a 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp @@ -525,7 +525,7 @@ bool QmlObjectNode::hasDefaultProperty() const return modelNode().metaInfo().hasDefaultProperty(); } -PropertyName QmlObjectNode::defaultProperty() const +PropertyName QmlObjectNode::defaultPropertyName() const { return modelNode().metaInfo().defaultPropertyName(); } @@ -533,7 +533,7 @@ PropertyName QmlObjectNode::defaultProperty() const void QmlObjectNode::setParent(QmlObjectNode newParent) { if (newParent.hasDefaultProperty()) - newParent.modelNode().nodeAbstractProperty(newParent.defaultProperty()).reparentHere(modelNode()); + newParent.modelNode().nodeAbstractProperty(newParent.defaultPropertyName()).reparentHere(modelNode()); } QmlItemNode QmlObjectNode::toQmlItemNode() const |