QmlDesigner.propertyEditor: qml cleanup

12 files changed, 461 insertions, 345 deletions

diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
index e81d981445..214d156e2b 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
@@ -1,64 +1,76 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
-    maximumHeight: 240;
+QWidget {
+    layout: QVBoxLayout {
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
 
-    finished: finishedNotify;
-    caption: "Image";
 
-    layout: VerticalLayout {
+        GroupBox {
+            maximumHeight: 240;
 
-        FileWidget {
-            enabled: isBaseState || backendValues.id.value != "";
-            maximumWidth: 250;
-            text: "Source";
-            fileName: backendValues.source.value;
-            onFileNameChanged: {
-                backendValues.source.value = fileName;
-            }
-        }
+            finished: finishedNotify;
+            caption: "Image";
 
+            layout: VerticalLayout {
 
-        IntEditor {
-            id: pixelSize;
-            backendValue: backendValues.border_left;
-            caption: "Left"
-            baseStateFlag: isBaseState;
+                FileWidget {
+                    enabled: isBaseState || backendValues.id.value != "";
+                    maximumWidth: 250;
+                    text: "Source";
+                    fileName: backendValues.source.value;
+                    onFileNameChanged: {
+                        backendValues.source.value = fileName;
+                    }
+                }
 
-            step: 1;
-            minimumValue: 0;
-            maximumValue: 2000;
-        }
 
-        IntEditor {
-            backendValue: backendValues.border_right;
-            caption: "Right"
-            baseStateFlag: isBaseState;
+                IntEditor {
+                    id: pixelSize;
+                    backendValue: backendValues.border_left;
+                    caption: "Left"
+                    baseStateFlag: isBaseState;
 
-            step: 1;
-            minimumValue: 0;
-            maximumValue: 2000;
-        }
+                    step: 1;
+                    minimumValue: 0;
+                    maximumValue: 2000;
+                }
 
-        IntEditor {
-            backendValue: backendValues.border_top;
-            caption: "Top"
-            baseStateFlag: isBaseState;
+                IntEditor {
+                    backendValue: backendValues.border_right;
+                    caption: "Right"
+                    baseStateFlag: isBaseState;
 
-            step: 1;
-            minimumValue: 0;
-            maximumValue: 2000;
-        }
+                    step: 1;
+                    minimumValue: 0;
+                    maximumValue: 2000;
+                }
 
-        IntEditor {
-            backendValue: backendValues.border_bottom;
-            caption: "Bottom"
-            baseStateFlag: isBaseState;
+                IntEditor {
+                    backendValue: backendValues.border_top;
+                    caption: "Top"
+                    baseStateFlag: isBaseState;
 
-            step: 1;
-            minimumValue: 0;
-            maximumValue: 2000;
+                    step: 1;
+                    minimumValue: 0;
+                    maximumValue: 2000;
+                }
+
+                IntEditor {
+                    backendValue: backendValues.border_bottom;
+                    caption: "Bottom"
+                    baseStateFlag: isBaseState;
+
+                    step: 1;
+                    minimumValue: 0;
+                    maximumValue: 2000;
+                }
+            }
         }
+
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
index 65b3741e35..399a369a26 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
@@ -1,29 +1,41 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
-    maximumHeight: 200;
+QWidget {
+    layout: QVBoxLayout {
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+        GroupBox {
 
-    finished: finishedNotify;
-    caption: "Grid";
-    id: gridSpecifics;
 
-    layout: QVBoxLayout {
+            GroupBox {
+                maximumHeight: 200;
+
+                finished: finishedNotify;
+                caption: "Grid";
+                id: gridSpecifics;
+
+                layout: QVBoxLayout {
 
-        topMargin: 18;
-        bottomMargin: 2;
-        leftMargin: 8;
-        rightMargin: 8;
+                    topMargin: 18;
+                    bottomMargin: 2;
+                    leftMargin: 8;
+                    rightMargin: 8;
 
 
-            IntEditor {
-                id: spacing;
-                backendValue: backendValues.spacing;
-                caption: "Spacing"
-                baseStateFlag: isBaseState;
-                step: 1;
-                minimumValue: 0;
-                maximumValue: 200;
+                    IntEditor {
+                        id: spacing;
+                        backendValue: backendValues.spacing;
+                        caption: "Spacing"
+                        baseStateFlag: isBaseState;
+                        step: 1;
+                        minimumValue: 0;
+                        maximumValue: 200;
+                    }
+                }
             }
+        }
     }
-}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
index b92c29311b..e394e1ed29 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
@@ -100,9 +100,9 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
 
             onFocusChanged: {
                 if (focus)
-                doubleSpinBox.backendValue.lock();
+                transaction.start();
                 else
-                doubleSpinBox.backendValue.unlock();
+                transaction.end();
             }
         }
     }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
index 8008141d83..b2dd86972e 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
@@ -1,109 +1,121 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
-    finished: finishedNotify;
-    caption: "Flickable";
-
+QWidget {
     layout: QVBoxLayout {
-        topMargin: 15;
-        bottomMargin: 6;
-        leftMargin: 0;
-        rightMargin: 0;
-
-        QWidget {
-            id: contentWidget;
-            maximumHeight: 220;
-
-            layout: QHBoxLayout {
-                topMargin: 0;
-                bottomMargin: 0;
-                leftMargin: 10;
-                rightMargin: 10;
-
-                QWidget {
-                    layout: QVBoxLayout {
-                        topMargin: 0;
-                        bottomMargin: 0;
-                        leftMargin: 0;
-                        rightMargin: 0;
-                        QLabel {
-                            minimumHeight: 20;
-                            text: "Horizontal Velocity:"
-                            font.bold: true;
-                        }
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+        GroupBox {
 
-                        QLabel {
-                            minimumHeight: 20;
-                            text: "Vertical Velocity:"
-                            font.bold: true;
-                        }
 
-                        QLabel {
-                            minimumHeight: 20;
-                            text: "Maximum Flick Velocity:"
-                            font.bold: true;
-                        }
+            GroupBox {
+                finished: finishedNotify;
+                caption: "Flickable";
 
-                        QLabel {
-                            minimumHeight: 20;
-                            text: "Over Shoot:"
-                            font.bold: true;
-                        }
-                    }
-                }
+                layout: QVBoxLayout {
+                    topMargin: 15;
+                    bottomMargin: 6;
+                    leftMargin: 0;
+                    rightMargin: 0;
 
-                QWidget {
-                    layout: QVBoxLayout {
-                        topMargin: 0;
-                        bottomMargin: 0;
-                        leftMargin: 0;
-                        rightMargin: 0;
-
-
-                        DoubleSpinBox {
-                            id: horizontalVelocitySpinBox;
-                            objectName: "horizontalVelocitySpinBox";
-                            backendValue: backendValues.horizontalVelocity;
-                            minimumWidth: 30;
-                            minimum: 0.1
-                            maximum: 10
-                            singleStep: 0.1
-                            baseStateFlag: isBaseState;
-                        }
+                    QWidget {
+                        id: contentWidget;
+                        maximumHeight: 220;
 
-                        DoubleSpinBox {
-                            id: verticalVelocitySpinBox;
-                            objectName: "verticalVelocitySpinBox";
-                            backendValue: backendValues.verticalVelocity;
-                            minimumWidth: 30;
-                            minimum: 0.1
-                            maximum: 10
-                            singleStep: 0.1
-                            baseStateFlag: isBaseState;
-                        }
+                        layout: QHBoxLayout {
+                            topMargin: 0;
+                            bottomMargin: 0;
+                            leftMargin: 10;
+                            rightMargin: 10;
 
-                        DoubleSpinBox {
-                            id: maximumVelocitySpinBox;
-                            objectName: "maximumVelocitySpinBox";
-                            backendValue: backendValues.maximumFlickVelocity;
-                            minimumWidth: 30;
-                            minimum: 0.1
-                            maximum: 10
-                            singleStep: 0.1
-                            baseStateFlag: isBaseState;
-                        }
+                            QWidget {
+                                layout: QVBoxLayout {
+                                    topMargin: 0;
+                                    bottomMargin: 0;
+                                    leftMargin: 0;
+                                    rightMargin: 0;
+                                    QLabel {
+                                        minimumHeight: 20;
+                                        text: "Horizontal Velocity:"
+                                        font.bold: true;
+                                    }
+
+                                    QLabel {
+                                        minimumHeight: 20;
+                                        text: "Vertical Velocity:"
+                                        font.bold: true;
+                                    }
+
+                                    QLabel {
+                                        minimumHeight: 20;
+                                        text: "Maximum Flick Velocity:"
+                                        font.bold: true;
+                                    }
+
+                                    QLabel {
+                                        minimumHeight: 20;
+                                        text: "Over Shoot:"
+                                        font.bold: true;
+                                    }
+                                }
+                            }
+
+                            QWidget {
+                                layout: QVBoxLayout {
+                                    topMargin: 0;
+                                    bottomMargin: 0;
+                                    leftMargin: 0;
+                                    rightMargin: 0;
+
+
+                                    DoubleSpinBox {
+                                        id: horizontalVelocitySpinBox;
+                                        objectName: "horizontalVelocitySpinBox";
+                                        backendValue: backendValues.horizontalVelocity;
+                                        minimumWidth: 30;
+                                        minimum: 0.1
+                                        maximum: 10
+                                        singleStep: 0.1
+                                        baseStateFlag: isBaseState;
+                                    }
+
+                                    DoubleSpinBox {
+                                        id: verticalVelocitySpinBox;
+                                        objectName: "verticalVelocitySpinBox";
+                                        backendValue: backendValues.verticalVelocity;
+                                        minimumWidth: 30;
+                                        minimum: 0.1
+                                        maximum: 10
+                                        singleStep: 0.1
+                                        baseStateFlag: isBaseState;
+                                    }
+
+                                    DoubleSpinBox {
+                                        id: maximumVelocitySpinBox;
+                                        objectName: "maximumVelocitySpinBox";
+                                        backendValue: backendValues.maximumFlickVelocity;
+                                        minimumWidth: 30;
+                                        minimum: 0.1
+                                        maximum: 10
+                                        singleStep: 0.1
+                                        baseStateFlag: isBaseState;
+                                    }
 
-                        CheckBox {
-                            id: overshootCheckBox;
-                            text: "overshoot";
-                            backendValue: backendValues.overShoot;
-                            baseStateFlag: isBaseState;
-                            checkable: true;
+                                    CheckBox {
+                                        id: overshootCheckBox;
+                                        text: "overshoot";
+                                        backendValue: backendValues.overShoot;
+                                        baseStateFlag: isBaseState;
+                                        checkable: true;
+                                    }
+                                }
+                            }
                         }
                     }
                 }
             }
         }
     }
-}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
index f1793c900a..646cc3b4cb 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
@@ -1,9 +1,22 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
-    maximumHeight: 200;
+QWidget {
+    layout: QVBoxLayout {
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+        GroupBox {
 
-    finished: finishedNotify;
 
-}
+            GroupBox {
+                maximumHeight: 200;
+
+                finished: finishedNotify;
+
+            }
+
+        }
+    }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
index 03532c48fd..da8c4ccadf 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
@@ -1,6 +1,16 @@
 import Qt 4.6
 import Bauhaus 1.0
 
+QWidget {
+    layout: QVBoxLayout {
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+GroupBox {
+
+
 GroupBox {
     maximumHeight: 200;
 
@@ -47,3 +57,6 @@ GroupBox {
             }
     }
 }
+
+}
+}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
index 1a4629287b..08335b2739 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
@@ -1,56 +1,72 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
-    maximumHeight: 240;
 
-    finished: finishedNotify;
-    caption: "Image";
+import Qt 4.6
+import Bauhaus 1.0
 
-    layout: VerticalLayout {
 
-        FileWidget {
-            enabled: isBaseState || backendValues.id.value != "";
-            text: "Source: ";
-            fileName: backendValues.source.value;
-            onFileNameChanged: {
-                backendValues.source.value = fileName;
-            }
-        }
+QWidget {
+    layout: QVBoxLayout {
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+        GroupBox {
+            maximumHeight: 240;
 
-        QWidget {
-            layout: HorizontalLayout {
-                Label {
-                    text: "Fill Mode"
-                }
+            finished: finishedNotify;
+            caption: "Image";
+
+            layout: VerticalLayout {
 
-                ComboBox {
-                    baseStateFlag: isBaseState
-                    items : { ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally"] }
-                    currentText: backendValues.fillMode.value;
-                    onItemsChanged: {
-                        currentText =  backendValues.fillMode.value;
+                FileWidget {
+                    enabled: isBaseState || backendValues.id.value != "";
+                    text: "Source: ";
+                    fileName: backendValues.source.value;
+                    onFileNameChanged: {
+                        backendValues.source.value = fileName;
                     }
-                    backendValue: backendValues.fillMode
                 }
-            }
-        }
 
-        QWidget {
-            layout: HorizontalLayout {
-                Label {
-                    text: "Antialiasing:"
+                QWidget {
+                    layout: HorizontalLayout {
+                        Label {
+                            text: "Fill Mode"
+                        }
+
+                        ComboBox {
+                            baseStateFlag: isBaseState
+                            items : { ["Stretch", "PreserveAspectFit", "PreserveAspectCrop", "Tile", "TileVertically", "TileHorizontally"] }
+                            currentText: backendValues.fillMode.value;
+                            onItemsChanged: {
+                                currentText =  backendValues.fillMode.value;
+                            }
+                            backendValue: backendValues.fillMode
+                        }
+                    }
                 }
 
-                CheckBox {
-                    text: "Smooth";
-                    backendValue: backendValues.smooth
-                    baseStateFlag: isBaseState;
-                    checkable: true;
-                    x: 28;  // indent a bit
+                QWidget {
+                    layout: HorizontalLayout {
+                        Label {
+                            text: "Antialiasing:"
+                        }
+
+                        CheckBox {
+                            text: "Smooth";
+                            backendValue: backendValues.smooth
+                            baseStateFlag: isBaseState;
+                            checkable: true;
+                            x: 28;  // indent a bit
+                        }
+                    }
                 }
+
             }
         }
 
+        QScrollArea {}
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
index b7d9fc7fc7..6333e111b6 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
@@ -1,75 +1,88 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
- finished: finishedNotify;
-    caption: "List View";
-
+QWidget {
     layout: QVBoxLayout {
-        topMargin: 15;
-        bottomMargin: 6;
-        leftMargin: 0;
-        rightMargin: 0;
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+        GroupBox {
 
-        QWidget {
-            id: contentWidget;
-             maximumHeight: 260;
 
-             layout: QHBoxLayout {
-                topMargin: 0;
-                bottomMargin: 0;
-                leftMargin: 10;
-                rightMargin: 10;
+            GroupBox {
+                finished: finishedNotify;
+                caption: "List View";
 
-                QWidget {
-                    layout: QVBoxLayout {
-                        topMargin: 0;
-                        bottomMargin: 0;
-                        leftMargin: 0;
-                        rightMargin: 0;
-                        QLabel {
-                            minimumHeight: 22;
-                            text: "Highlight:"
-                            font.bold: true;
-                        }
+                layout: QVBoxLayout {
+                    topMargin: 15;
+                    bottomMargin: 6;
+                    leftMargin: 0;
+                    rightMargin: 0;
 
-                        QLabel {
-                            minimumHeight: 22;
-                            text: "Spacing:"
-                            font.bold: true;
-                        }
-                    }
-                }
+                    QWidget {
+                        id: contentWidget;
+                        maximumHeight: 260;
 
-                QWidget {
-                    layout: QVBoxLayout {
-                        topMargin: 0;
-                        bottomMargin: 0;
-                        leftMargin: 0;
-                        rightMargin: 0;
+                        layout: QHBoxLayout {
+                            topMargin: 0;
+                            bottomMargin: 0;
+                            leftMargin: 10;
+                            rightMargin: 10;
 
-                        CheckBox {
-                            id: highlightFollowsCurrentItemCheckBox;
-                            text: "Follows";
-                            backendValue: backendValues.highlightFollowsCurrentItem;
-                            baseStateFlag: isBaseState;
-                            checkable: true;
-                        }
+                            QWidget {
+                                layout: QVBoxLayout {
+                                    topMargin: 0;
+                                    bottomMargin: 0;
+                                    leftMargin: 0;
+                                    rightMargin: 0;
+                                    QLabel {
+                                        minimumHeight: 22;
+                                        text: "Highlight:"
+                                        font.bold: true;
+                                    }
 
-                        SpinBox {
-                            id: spacingSpinBox;
-                            objectName: "spacingSpinBox";
-                            backendValue: backendValues.spacing;
-                            minimumWidth: 30;
-                            minimum: 0;
-                            maximum: 1000;
-                            singleStep: 1;
-                            baseStateFlag: isBaseState;
-                        }
+                                    QLabel {
+                                        minimumHeight: 22;
+                                        text: "Spacing:"
+                                        font.bold: true;
+                                    }
+                                }
+                            }
+
+                            QWidget {
+                                layout: QVBoxLayout {
+                                    topMargin: 0;
+                                    bottomMargin: 0;
+                                    leftMargin: 0;
+                                    rightMargin: 0;
+
+                                    CheckBox {
+                                        id: highlightFollowsCurrentItemCheckBox;
+                                        text: "Follows";
+                                        backendValue: backendValues.highlightFollowsCurrentItem;
+                                        baseStateFlag: isBaseState;
+                                        checkable: true;
+                                    }
 
+                                    SpinBox {
+                                        id: spacingSpinBox;
+                                        objectName: "spacingSpinBox";
+                                        backendValue: backendValues.spacing;
+                                        minimumWidth: 30;
+                                        minimum: 0;
+                                        maximum: 1000;
+                                        singleStep: 1;
+                                        baseStateFlag: isBaseState;
+                                    }
+
+                                }
+                            }
+                        }
                     }
                 }
             }
+
         }
     }
-}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
index 65b3741e35..399a369a26 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
@@ -1,29 +1,41 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
-    maximumHeight: 200;
+QWidget {
+    layout: QVBoxLayout {
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+        GroupBox {
 
-    finished: finishedNotify;
-    caption: "Grid";
-    id: gridSpecifics;
 
-    layout: QVBoxLayout {
+            GroupBox {
+                maximumHeight: 200;
+
+                finished: finishedNotify;
+                caption: "Grid";
+                id: gridSpecifics;
+
+                layout: QVBoxLayout {
 
-        topMargin: 18;
-        bottomMargin: 2;
-        leftMargin: 8;
-        rightMargin: 8;
+                    topMargin: 18;
+                    bottomMargin: 2;
+                    leftMargin: 8;
+                    rightMargin: 8;
 
 
-            IntEditor {
-                id: spacing;
-                backendValue: backendValues.spacing;
-                caption: "Spacing"
-                baseStateFlag: isBaseState;
-                step: 1;
-                minimumValue: 0;
-                maximumValue: 200;
+                    IntEditor {
+                        id: spacing;
+                        backendValue: backendValues.spacing;
+                        caption: "Spacing"
+                        baseStateFlag: isBaseState;
+                        step: 1;
+                        minimumValue: 0;
+                        maximumValue: 200;
+                    }
+                }
             }
+        }
     }
-}
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
index 86fcbaf94c..299028ce4b 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
@@ -22,10 +22,10 @@ QWidget {
         }
 
         onSliderPressed: {
-            backendValue.lock();
+            transaction.start();
         }
         onSliderReleased: {
-            backendValue.unlock();
+            transaction.end();
         }
     }
 }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
index 60513e98e9..16f720c2f5 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
@@ -89,9 +89,9 @@ QWidget { //This is a special spinBox that does color coding for states
 
             onFocusChanged: {
                 if (focus)
-                spinBox.backendValue.lock();
+                transaction.start();
                 else
-                spinBox.backendValue.unlock();
+                transaction.end();
             }
             onEditingFinished: {
                 focus = false;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
index 438766610f..fc20303501 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
@@ -1,79 +1,92 @@
 import Qt 4.6
 import Bauhaus 1.0
 
-GroupBox {
-    maximumHeight: 200;
+QWidget {
+    layout: QVBoxLayout {
+        topMargin: 0
+        bottomMargin: 0
+        leftMargin: 0
+        rightMargin: 0
+        spacing: 0
+        GroupBox {
 
-    finished: finishedNotify;
-    caption: "WebView";
-    id: webViewSpecifics;
 
-    layout: VerticalLayout {
-        QWidget {
-            layout: HorizontalLayout {
-                leftMargin: 0;
-                rightMargin: 0;
-                Label {
-                    text: "Url"
-                }
-                LineEdit {
-                    backendValue: backendValues.url
-                    baseStateFlag: isBaseState;
-                }
-            }
-        }
+            GroupBox {
+                maximumHeight: 200;
 
-        IntEditor {
-            id: preferredWidth;
-            backendValue: backendValues.preferredWidth;
-            caption: "Prefered Width"
-            baseStateFlag: isBaseState;
-            step: 1;
-            minimumValue: 0;
-            maximumValue: 2000;
-        }
+                finished: finishedNotify;
+                caption: "WebView";
+                id: webViewSpecifics;
 
-        IntEditor {
-            id: webPageWidth;
-            backendValue: backendValues.preferredHeight;
-            caption: "Page Height"
-            baseStateFlag: isBaseState;
-            step: 1;
-            minimumValue: 0;
-            maximumValue: 2000;
-        }
+                layout: VerticalLayout {
+                    QWidget {
+                        layout: HorizontalLayout {
+                            leftMargin: 0;
+                            rightMargin: 0;
+                            Label {
+                                text: "Url"
+                            }
+                            LineEdit {
+                                backendValue: backendValues.url
+                                baseStateFlag: isBaseState;
+                            }
+                        }
+                    }
 
-        QWidget {
-            layout: HorizontalLayout {
+                    IntEditor {
+                        id: preferredWidth;
+                        backendValue: backendValues.preferredWidth;
+                        caption: "Prefered Width"
+                        baseStateFlag: isBaseState;
+                        step: 1;
+                        minimumValue: 0;
+                        maximumValue: 2000;
+                    }
 
-                Label {
-                    minimumHeight: 20;
-                    text: "Zoom Factor"
-                }
-                DoubleSpinBox {
-                    id: zoomSpinBox;
-                    minimumWidth: 60;
-                    text: ""
-                    backendValue: backendValues.zoomFactor;
-                    minimum: 0.01
-                    maximum: 10
-                    singleStep: 0.1
-                    baseStateFlag: isBaseState;
-                    onBackendValueChanged: {
-                        zoomSlider.value = backendValue.value * 10;
+                    IntEditor {
+                        id: webPageWidth;
+                        backendValue: backendValues.preferredHeight;
+                        caption: "Page Height"
+                        baseStateFlag: isBaseState;
+                        step: 1;
+                        minimumValue: 0;
+                        maximumValue: 2000;
                     }
-                }
-                QSlider {
-                    id: zoomSlider;
-                    orientation: "Qt::Horizontal";
-                    minimum: 1;
-                    maximum: 100;
-                    singleStep: 1;
-                    onValueChanged: {
-                        backendValues.zoomFactor.value = value / 10;
+
+                    QWidget {
+                        layout: HorizontalLayout {
+
+                            Label {
+                                minimumHeight: 20;
+                                text: "Zoom Factor"
+                            }
+                            DoubleSpinBox {
+                                id: zoomSpinBox;
+                                minimumWidth: 60;
+                                text: ""
+                                backendValue: backendValues.zoomFactor;
+                                minimum: 0.01
+                                maximum: 10
+                                singleStep: 0.1
+                                baseStateFlag: isBaseState;
+                                onBackendValueChanged: {
+                                    zoomSlider.value = backendValue.value * 10;
+                                }
+                            }
+                            QSlider {
+                                id: zoomSlider;
+                                orientation: "Qt::Horizontal";
+                                minimum: 1;
+                                maximum: 100;
+                                singleStep: 1;
+                                onValueChanged: {
+                                    backendValues.zoomFactor.value = value / 10;
+                                }
+                            }
+                        }
                     }
                 }
             }
+
         }
     }
-}