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

QmlDesigner: Crash fix

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2016-10-27 15:06:01 +02:00
committed by Thomas Hartmann
parent d8eb2bf762
commit 48537ca197
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/integration/componentview.cpp
View File

@@ -25,6 +25,9 @@
#include "componentview.h" #include "componentview.h"
#include "componentaction.h" #include "componentaction.h"
#include <nodemetainfo.h>
#include <QDebug> #include <QDebug>
#include <nodeabstractproperty.h> #include <nodeabstractproperty.h>
@@ -193,7 +196,9 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
foreach (const ModelNode &node, node.allSubModelNodesAndThisNode()) { foreach (const ModelNode &node, node.allSubModelNodesAndThisNode()) {
if (node.nodeSourceType() == ModelNode::NodeWithComponentSource if (node.nodeSourceType() == ModelNode::NodeWithComponentSource
|| (node.hasParentProperty() || (node.hasParentProperty()
&& !node.parentProperty().isDefaultProperty())) { && !node.parentProperty().isDefaultProperty()
&& node.metaInfo().isValid()
&& node.metaInfo().isGraphicalItem())) {
if (masterNotAdded) { if (masterNotAdded) {
masterNotAdded = true; masterNotAdded = true;
addMasterDocument(); addMasterDocument();