From 48537ca197cfea2b901a54d90546ed214bd68497 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Thu, 27 Oct 2016 15:06:01 +0200
Subject: [PATCH] QmlDesigner: Crash fix

Editing subcomponents should only be possible for
graphical items.
Qt Creator was crashing in case the node was something else.

Change-Id: Ia0e286c666b0b485da0817678ca2048ace260c9b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../qmldesigner/components/integration/componentview.cpp   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index 1bd29179ec8..77d2bf78a8a 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -25,6 +25,9 @@
 
 #include "componentview.h"
 #include "componentaction.h"
+
+#include <nodemetainfo.h>
+
 #include <QDebug>
 
 #include <nodeabstractproperty.h>
@@ -193,7 +196,9 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
     foreach (const ModelNode &node, node.allSubModelNodesAndThisNode()) {
         if (node.nodeSourceType() == ModelNode::NodeWithComponentSource
                 || (node.hasParentProperty()
-                    && !node.parentProperty().isDefaultProperty())) {
+                    && !node.parentProperty().isDefaultProperty()
+                    && node.metaInfo().isValid()
+                    && node.metaInfo().isGraphicalItem())) {
             if (masterNotAdded) {
                 masterNotAdded = true;
                 addMasterDocument();