diff --git a/tests/auto/qml/qmldesigner/data/merging/ButtonOutlineExpected.qml b/tests/auto/qml/qmldesigner/data/merging/ButtonOutlineExpected.qml index a6b9e4af2f1..abe67f4fe8e 100644 --- a/tests/auto/qml/qmldesigner/data/merging/ButtonOutlineExpected.qml +++ b/tests/auto/qml/qmldesigner/data/merging/ButtonOutlineExpected.qml @@ -22,8 +22,6 @@ T.Button { Rectangle { id: buttonNormal - x: 286 - y: 62 width: 100 height: 60 color: "#d4d4d4" @@ -38,7 +36,6 @@ T.Button { color: "#808080" text: control.text elide: Text.ElideRight - anchors.fill: parent horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -46,8 +43,6 @@ T.Button { Rectangle { id: buttonPressed - x: 123 - y: 62 width: 100 height: 60 color: "#69b5ec" @@ -62,7 +57,6 @@ T.Button { color: "#000000" text: control.text elide: Text.ElideRight - anchors.fill: parent horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } diff --git a/tests/auto/qml/qmldesigner/data/merging/ButtonStyle.ui.Expected.qml b/tests/auto/qml/qmldesigner/data/merging/ButtonStyle.ui.Expected.qml index f50c211ecb7..7faf527196d 100644 --- a/tests/auto/qml/qmldesigner/data/merging/ButtonStyle.ui.Expected.qml +++ b/tests/auto/qml/qmldesigner/data/merging/ButtonStyle.ui.Expected.qml @@ -22,55 +22,44 @@ T.Button { Image { id: buttonNormal - color: "#d4d4d4" - x: 14 - y: 5 - width: 100 //Bit of black magic to define the default size + width: 100 height: 40 - - border.color: "gray" - border.width: 1 - radius: 2 - anchors.fill: parent //binding has to be preserved + anchors.fill: parent source: "assets/buttonNormal.png" - Text { id: normalText x: 58 - y: 50 //id only required to preserve binding - text: control.text //binding has to be preserved - //anchors.fill: parent - color: "#BBBBBB" - font.letterSpacing: 0.594 + y: 50 + color: "#bbbbbb" + text: control.text + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter font.pixelSize: 24 + font.letterSpacing: 0.594 } } Image { id: buttonPressed - x: 290 - y: 5 - width: 100 //Bit of black magic to define the default size + width: 100 height: 40 + anchors.fill: parent source: "assets/buttonPressed.png" - - border.color: "gray" - border.width: 1 - radius: 2 - anchors.fill: parent //binding has to be preserved - Text { - id: pressedText //id only required to preserve binding + id: pressedText x: 58 y: 50 - text: control.text //binding has to be preserved - //anchors.fill: parent - color: "#E1E1E1" - - font.letterSpacing: 0.594 + color: "#e1e1e1" + text: control.text + elide: Text.ElideRight + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter font.pixelSize: 24 + font.letterSpacing: 0.594 } } + } contentItem: Item {} diff --git a/tests/auto/qml/qmldesigner/data/merging/SwitchExpected.qml b/tests/auto/qml/qmldesigner/data/merging/SwitchExpected.qml index 7cb59ec1036..ebaf20c1781 100644 --- a/tests/auto/qml/qmldesigner/data/merging/SwitchExpected.qml +++ b/tests/auto/qml/qmldesigner/data/merging/SwitchExpected.qml @@ -40,9 +40,9 @@ T.Switch { color: "#c2c2c2" border.color: "#808080" anchors.fill: parent - Text { - text: "background" + id: switchBackgroundText + text: control.text anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: 12 diff --git a/tests/auto/qml/qmldesigner/data/merging/SwitchTemplate.qml b/tests/auto/qml/qmldesigner/data/merging/SwitchTemplate.qml index d45756494b8..2d794a8469c 100644 --- a/tests/auto/qml/qmldesigner/data/merging/SwitchTemplate.qml +++ b/tests/auto/qml/qmldesigner/data/merging/SwitchTemplate.qml @@ -28,12 +28,6 @@ T.Switch { text: control.text // has to be preserved anchors.rightMargin: 12 * 5 } - Rectangle { - id: nonSenseRectangle - width: 5 * 12.0 - height: 6 * 49.0 - color: "#ff0000" - } } }