From b4599aa25016ce514e16f4b88d45cd87aa782741 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@digia.com>
Date: Tue, 12 Aug 2014 13:19:03 +0200
Subject: [PATCH] QmlDesigner: fix binding loops while resizing

Change-Id: I897f7767f5539b4297cf9a0bbaf290adf82cb88b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../propertyEditorQmlSources/QtQuick/ItemPane.qml   | 11 ++++-------
 .../QtQuick/QtObjectPane.qml                        | 13 ++++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
index 693d069b407..fa64043c490 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
@@ -75,17 +75,14 @@ Rectangle {
                             placeholderText: qsTr("id")
                             text: backendValues.id.value
                             Layout.fillWidth: true
-                            Layout.maximumWidth: 320
                             showTranslateCheckBox: false
                             showExtendedFunctionButton: false
                         }
-
-                        ExpandingSpacer {
-                        }
-
+                        // workaround: without this item the lineedit does not shrink to the
+                        // right size after resizing to a wider width
                         Item {
-                            width: 16
-                            height: 16
+                            width: 0
+                            height: 1
                         }
                     }
                 }
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml
index 8e86a559bdb..59ba8b62dbd 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/QtObjectPane.qml
@@ -75,15 +75,14 @@ Rectangle {
                             placeholderText: qsTr("id")
                             text: backendValues.id.value
                             Layout.fillWidth: true
-                            Layout.maximumWidth: 320
+                            showTranslateCheckBox: false
+                            showExtendedFunctionButton: false
                         }
-
-                        ExpandingSpacer {
-                        }
-
+                        // workaround: without this item the lineedit does not shrink to the
+                        // right size after resizing to a wider width
                         Item {
-                            width: 16
-                            height: 16
+                            width: 0
+                            height: 1
                         }
                     }
                 }