diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
index 1a4825f23efa39fc2bf637cba51190b3757e5ba7..df7f4af02ed90f74e38ab7b7da1ef487dd2f3e60 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
@@ -8,11 +8,11 @@ GroupBox {
id: layout;
enabled: anchorBackend.hasParent;
-
+
property bool isInBaseState: isBaseState
property variant targetLabelWidth: 90 - 20 - 26
- property int leftMarginMargin: 16
+ property int leftMarginMargin: 16
layout: VerticalLayout {
Label {
@@ -21,7 +21,7 @@ GroupBox {
QWidget {
layout: HorizontalLayout {
leftMargin: 10
- topMargin: 8
+ topMargin: 8
AnchorButtons {
@@ -64,7 +64,7 @@ GroupBox {
QWidget {
layout : HorizontalLayout {
- leftMargin: leftMarginMargin
+ leftMargin: leftMarginMargin
IntEditor {
id:topbox
slider: false
@@ -114,7 +114,7 @@ GroupBox {
QWidget {
layout : HorizontalLayout {
- leftMargin: leftMarginMargin
+ leftMargin: leftMarginMargin
IntEditor {
slider: false
caption: qsTr("Margin")
@@ -162,7 +162,7 @@ GroupBox {
QWidget {
layout : HorizontalLayout {
- leftMargin: leftMarginMargin
+ leftMargin: leftMarginMargin
IntEditor {
slider: false
caption: qsTr("Margin")
@@ -210,7 +210,7 @@ GroupBox {
QWidget {
layout : HorizontalLayout {
- leftMargin: leftMarginMargin
+ leftMargin: leftMarginMargin
IntEditor {
slider: false
caption: qsTr("Margin")
@@ -258,7 +258,7 @@ GroupBox {
QWidget {
layout : HorizontalLayout {
- leftMargin: leftMarginMargin
+ leftMargin: leftMarginMargin
IntEditor {
slider: false
caption: qsTr("Margin")
@@ -306,8 +306,8 @@ GroupBox {
QWidget {
layout : HorizontalLayout {
- leftMargin: leftMarginMargin
- IntEditor {
+ leftMargin: leftMarginMargin
+ IntEditor {
slider: false
caption: qsTr("Margin")
backendValue: backendValues.anchors_verticalCenterOffset
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
index f38c54c673f613f0b80233bd425d71f28115c8c7..f22c0c75e9c112099bc897313ca51e340f9e6048 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
@@ -15,12 +15,12 @@ QScrollArea {
bottomMargin: 0;
leftMargin: 0;
rightMargin: 0;
- spacing: 0
-
- Geometry {
- }
-
- Layout {
+ spacing: 0
+
+ Geometry {
+ }
+
+ Layout {
id: layoutBox;
}
QScrollArea {
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
index 59bc6f4b4d9c7e376d55d514451ff5bc763caac2..bedc28641bdf0f781e43ca63ba594ba6336f1f26 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
@@ -112,11 +112,10 @@ GroupBox {
showButtons: true;
backendColor: backendValues.border_color
-
+
property variant backendColorValue: backendValues.border_color.vlaue
enabled: isBaseState || hasBorder
-
onBackendColorValueChanged: {
if (backendValues.border_color.isInModel)
borderColorBox.setNoneButtonChecked = true;