diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2014-08-12 13:19:03 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2014-08-12 13:58:03 +0200 |
| commit | b4599aa25016ce514e16f4b88d45cd87aa782741 (patch) | |
| tree | 697ed7ed23408d64dfb020dccacf9ede930a064e /share | |
| parent | 673b1c2cb42015e7bf7ca8c8ab27628bc24e5eac (diff) | |
QmlDesigner: fix binding loops while resizing
Change-Id: I897f7767f5539b4297cf9a0bbaf290adf82cb88b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml | 11 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/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 693d069b40..fa64043c49 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 8e86a559bd..59ba8b62db 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 } } } |