From 8102f3f6d23e92451755baf6516c34edea42f1a2 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 24 Jun 2011 16:05:49 +0200
Subject: [PATCH] QmlDesigner.componentView: fix for captions

Change-Id: I0ea2441d2989b8e395955b5e19ad45d341d12379
Reviewed-on: http://codereview.qt.nokia.com/716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
 .../qmldesigner/components/integration/componentview.cpp    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index 598caf6b2ab..4adc4a57dd6 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -142,10 +142,10 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
                 QString description;
                 ModelNode parentNode = node.parentProperty().parentModelNode();
                 if (parentNode.isValid()) {
-                    if (!parentNode.id().isEmpty()) {
-                        description = node.parentProperty().parentModelNode().id() + QLatin1Char(' ');
+                    if (parentNode.id().isEmpty()) {
+                        description = parentNode.simplifiedTypeName() + QLatin1Char(' ');
                     } else {
-                        description = node.parentProperty().parentModelNode().simplifiedTypeName() + QLatin1Char(' ');
+                        description = parentNode.id() + QLatin1Char(' ');
                     }
                 }
                 description += node.parentProperty().name();