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

QmlDesigner: Adding try catch block

Browse Source 
Change-Id: I4956b58f1ffd3bfdf0e6b810de1f411ae7d7f8a0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2016-10-19 11:48:50 +02:00
parent 757153fce5
commit cedf7a012e
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
View File

@@ -666,20 +666,24 @@ static bool isInLayoutable(NodeAbstractProperty &parentProperty)
static void reparentModelNodeToNodeProperty(NodeAbstractProperty &parentProperty, const ModelNode &modelNode) static void reparentModelNodeToNodeProperty(NodeAbstractProperty &parentProperty, const ModelNode &modelNode)
{ {
if (!modelNode.hasParentProperty() || parentProperty != modelNode.parentProperty()) { try {
if (isInLayoutable(parentProperty)) { if (!modelNode.hasParentProperty() || parentProperty != modelNode.parentProperty()) {
removePosition(modelNode); if (isInLayoutable(parentProperty)) {
parentProperty.reparentHere(modelNode); removePosition(modelNode);
} else {
if (QmlItemNode::isValidQmlItemNode(modelNode)) {
QPointF scenePosition = QmlItemNode(modelNode).instanceScenePosition();
parentProperty.reparentHere(modelNode); parentProperty.reparentHere(modelNode);
if (!scenePosition.isNull())
setScenePosition(modelNode, scenePosition);
} else { } else {
parentProperty.reparentHere(modelNode); if (QmlItemNode::isValidQmlItemNode(modelNode)) {
QPointF scenePosition = QmlItemNode(modelNode).instanceScenePosition();
parentProperty.reparentHere(modelNode);
if (!scenePosition.isNull())
setScenePosition(modelNode, scenePosition);
} else {
parentProperty.reparentHere(modelNode);
}
} }
} }
} catch (const RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
exception.showException();
} }
} }