feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix test data for StyleMerger

Browse Source 
* This seems be the correct expected outcome.
* Minor fix in SwitchTemplate

Change-Id: I5de04d943d3522a37ac1664157f384594ddddcde
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2020-05-27 20:32:26 +02:00
committed by Michael Brüning
parent 96a511c979
commit e5d892c74a
4 changed files with 21 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/qml/qmldesigner/data/merging/ButtonOutlineExpected.qml
View File

@@ -22,8 +22,6 @@ T.Button {
Rectangle { Rectangle {
id: buttonNormal id: buttonNormal
x: 286
y: 62
width: 100 width: 100
height: 60 height: 60
color: "#d4d4d4" color: "#d4d4d4"
@@ -38,7 +36,6 @@ T.Button {
color: "#808080" color: "#808080"
text: control.text text: control.text
elide: Text.ElideRight elide: Text.ElideRight
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
@@ -46,8 +43,6 @@ T.Button {
Rectangle { Rectangle {
id: buttonPressed id: buttonPressed
x: 123
y: 62
width: 100 width: 100
height: 60 height: 60
color: "#69b5ec" color: "#69b5ec"
@@ -62,7 +57,6 @@ T.Button {
color: "#000000" color: "#000000"
text: control.text text: control.text
elide: Text.ElideRight elide: Text.ElideRight
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }

49
tests/auto/qml/qmldesigner/data/merging/ButtonStyle.ui.Expected.qml
View File

@@ -22,55 +22,44 @@ T.Button {
Image { Image {
id: buttonNormal id: buttonNormal
color: "#d4d4d4" width: 100
x: 14
y: 5
width: 100 //Bit of black magic to define the default size
height: 40 height: 40
anchors.fill: parent
border.color: "gray"
border.width: 1
radius: 2
anchors.fill: parent //binding has to be preserved
source: "assets/buttonNormal.png" source: "assets/buttonNormal.png"
Text { Text {
id: normalText id: normalText
x: 58 x: 58
y: 50 //id only required to preserve binding y: 50
text: control.text //binding has to be preserved color: "#bbbbbb"
//anchors.fill: parent text: control.text
color: "#BBBBBB" elide: Text.ElideRight
font.letterSpacing: 0.594 horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
font.pixelSize: 24 font.pixelSize: 24
font.letterSpacing: 0.594
} }
} }
Image { Image {
id: buttonPressed id: buttonPressed
x: 290 width: 100
y: 5
width: 100 //Bit of black magic to define the default size
height: 40 height: 40
anchors.fill: parent
source: "assets/buttonPressed.png" source: "assets/buttonPressed.png"
border.color: "gray"
border.width: 1
radius: 2
anchors.fill: parent //binding has to be preserved
Text { Text {
id: pressedText //id only required to preserve binding id: pressedText
x: 58 x: 58
y: 50 y: 50
text: control.text //binding has to be preserved color: "#e1e1e1"
//anchors.fill: parent text: control.text
color: "#E1E1E1" elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
font.letterSpacing: 0.594 verticalAlignment: Text.AlignVCenter
font.pixelSize: 24 font.pixelSize: 24
font.letterSpacing: 0.594
} }
} }
} }
contentItem: Item {} contentItem: Item {}

4
tests/auto/qml/qmldesigner/data/merging/SwitchExpected.qml
View File

@@ -40,9 +40,9 @@ T.Switch {
color: "#c2c2c2" color: "#c2c2c2"
border.color: "#808080" border.color: "#808080"
anchors.fill: parent anchors.fill: parent
Text { Text {
text: "background" id: switchBackgroundText
text: control.text
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 12 anchors.rightMargin: 12

6
tests/auto/qml/qmldesigner/data/merging/SwitchTemplate.qml
View File

@@ -28,12 +28,6 @@ T.Switch {
text: control.text // has to be preserved text: control.text // has to be preserved
anchors.rightMargin: 12 * 5 anchors.rightMargin: 12 * 5
} }
Rectangle {
id: nonSenseRectangle
width: 5 * 12.0
height: 6 * 49.0
color: "#ff0000"
}
} }
} }