From dd2d17ed36e8f7c9ade33a31c688a4b974e12071 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Thu, 28 Jul 2016 10:14:31 +0200
Subject: [PATCH] QmlDesigner.FormEditor: Do not overwrite auxiliaryData
 width/height

We using F2/goto into component the auxiliaryData is typically
already set.

Change-Id: Ib201198f5fcd7a716fb416b54537488cc5b68afc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../qmldesigner/components/formeditor/formeditorview.cpp    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index 1e3f09fac2a..8e8c996793a 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -424,8 +424,10 @@ void FormEditorView::instanceInformationsChange(const QMultiHash<ModelNode, Info
                 if (qmlItemNode.instanceBoundingRect().isEmpty() &&
                         !(qmlItemNode.propertyAffectedByCurrentState("width")
                           && qmlItemNode.propertyAffectedByCurrentState("height"))) {
-                    rootModelNode().setAuxiliaryData("width", 640);
-                    rootModelNode().setAuxiliaryData("height", 480);
+                    if (!(rootModelNode().hasAuxiliaryData("width")))
+                        rootModelNode().setAuxiliaryData("width", 640);
+                    if (!(rootModelNode().hasAuxiliaryData("height")))
+                        rootModelNode().setAuxiliaryData("height", 480);
                     rootModelNode().setAuxiliaryData("autoSize", true);
                     formEditorWidget()->updateActions();
                 } else {