summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/visual
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative/visual')
-rw-r--r--tests/auto/declarative/visual/Package_Views/packageviews.qml4
-rw-r--r--tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml6
-rw-r--r--tests/auto/declarative/visual/animation/colorAnimation/colorAnimation.qml2
-rw-r--r--tests/auto/declarative/visual/animation/easing/easing.qml2
-rw-r--r--tests/auto/declarative/visual/animation/parallelAnimation/parallelAnimation.qml2
-rw-r--r--tests/auto/declarative/visual/animation/parentAction/parentAction.qml2
-rw-r--r--tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml2
-rw-r--r--tests/auto/declarative/visual/animation/reanchor/reanchor.qml4
-rw-r--r--tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml2
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml8
-rw-r--r--tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml2
-rw-r--r--tests/auto/declarative/visual/qmlmouseregion/drag.qml2
-rw-r--r--tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml14
-rw-r--r--tests/auto/declarative/visual/qmlspringfollow/follow.qml2
-rw-r--r--tests/auto/declarative/visual/selftest_noimages/selftest_noimages.qml2
-rw-r--r--tests/auto/declarative/visual/webview/settings/noAutoLoadImages.qml2
16 files changed, 29 insertions, 29 deletions
diff --git a/tests/auto/declarative/visual/Package_Views/packageviews.qml b/tests/auto/declarative/visual/Package_Views/packageviews.qml
index dcfe7de..b577e45 100644
--- a/tests/auto/declarative/visual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/visual/Package_Views/packageviews.qml
@@ -29,14 +29,14 @@ Rectangle {
delegate: Package {
Rectangle {
id: listItem; Package.name: "list"; width:root.width/2; height: 50; color: "transparent"; border.color: "white"
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: myState.state = myState.state == "list" ? "grid" : "list"
}
}
Rectangle {
id: gridItem; Package.name: "grid"; width:50; height: 50; color: "transparent"; border.color: "white"
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: myState.state = myState.state == "list" ? "grid" : "list"
}
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
index 5230ca4..70c14cf 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
+++ b/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
@@ -20,7 +20,7 @@ Rectangle {
x: 50 + 50
}
PropertyChanges {
- target: myMouseRegion
+ target: myMouseArea
onClicked: page.state = ''
}
}
@@ -32,8 +32,8 @@ Rectangle {
}
}
]
- MouseRegion {
- id: myMouseRegion
+ MouseArea {
+ id: myMouseArea
anchors.fill: parent
onClicked: { page.state= 'hello' }
}
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/colorAnimation.qml b/tests/auto/declarative/visual/animation/colorAnimation/colorAnimation.qml
index 0e98d7e..f205ae8 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/colorAnimation.qml
+++ b/tests/auto/declarative/visual/animation/colorAnimation/colorAnimation.qml
@@ -34,7 +34,7 @@ Rectangle {
}
}
]
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: { mainrect.state = 'second' }
}
diff --git a/tests/auto/declarative/visual/animation/easing/easing.qml b/tests/auto/declarative/visual/animation/easing/easing.qml
index f81400b..9c814eb 100644
--- a/tests/auto/declarative/visual/animation/easing/easing.qml
+++ b/tests/auto/declarative/visual/animation/easing/easing.qml
@@ -186,7 +186,7 @@ Rectangle {
}
}
}
- MouseRegion {
+ MouseArea {
id: mouse
anchors.fill: layout
}
diff --git a/tests/auto/declarative/visual/animation/parallelAnimation/parallelAnimation.qml b/tests/auto/declarative/visual/animation/parallelAnimation/parallelAnimation.qml
index 7021e05..1980b91 100644
--- a/tests/auto/declarative/visual/animation/parallelAnimation/parallelAnimation.qml
+++ b/tests/auto/declarative/visual/animation/parallelAnimation/parallelAnimation.qml
@@ -14,7 +14,7 @@ Rectangle {
color: "red"
}
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: parent.state = "state1"
}
diff --git a/tests/auto/declarative/visual/animation/parentAction/parentAction.qml b/tests/auto/declarative/visual/animation/parentAction/parentAction.qml
index e4f4406..eb3103e 100644
--- a/tests/auto/declarative/visual/animation/parentAction/parentAction.qml
+++ b/tests/auto/declarative/visual/animation/parentAction/parentAction.qml
@@ -15,7 +15,7 @@ Rectangle {
color: "red"
}
}
- MouseRegion {
+ MouseArea {
id: clickable
anchors.fill: parent
}
diff --git a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
index 68671e1..593f495 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
+++ b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
@@ -7,7 +7,7 @@ Rectangle {
width: 100; height: 100
color: "red"
}
- MouseRegion {
+ MouseArea {
id: clickable
anchors.fill: parent
}
diff --git a/tests/auto/declarative/visual/animation/reanchor/reanchor.qml b/tests/auto/declarative/visual/animation/reanchor/reanchor.qml
index 359346f..d80631f 100644
--- a/tests/auto/declarative/visual/animation/reanchor/reanchor.qml
+++ b/tests/auto/declarative/visual/animation/reanchor/reanchor.qml
@@ -19,7 +19,7 @@ Rectangle {
Item { id: topGuideline2; y: 50 }
Item { id: bottomGuideline2; y: 175 }
- MouseRegion {
+ MouseArea {
id: wholeArea
anchors.fill: parent
onClicked: {
@@ -55,7 +55,7 @@ Rectangle {
NumberAnimation { properties: "x,y,width,height" }
}
- MouseRegion {
+ MouseArea {
width: 50; height: 50
anchors.right: parent.right
anchors.bottom: parent.bottom
diff --git a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml b/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
index f121906..30d587a 100644
--- a/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
+++ b/tests/auto/declarative/visual/animation/scriptAction/scriptAction.qml
@@ -7,7 +7,7 @@ Rectangle {
width: 100; height: 100
color: "red"
}
- MouseRegion {
+ MouseArea {
id: clickable
anchors.fill: parent
}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
index cc15755..6204aa9 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
@@ -25,7 +25,7 @@ Rectangle {
Repeater {
model: list
Rectangle { width: 300; height: 200; color: mr.pressed ? "black" : dayColor
- MouseRegion {
+ MouseArea {
id: mr
anchors.fill: parent
}
@@ -49,7 +49,7 @@ Rectangle {
height: 48
y: parent.height - 50
color: "red"
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: flick.interactive = flick.interactive ? false : true
}
@@ -62,7 +62,7 @@ Rectangle {
x: 66
y: parent.height - 50
color: "green"
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: flick.pressDelay = flick.pressDelay > 0 ? 0 : 500
}
@@ -75,7 +75,7 @@ Rectangle {
x: 130
y: parent.height - 50
color: "yellow"
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: flick.overShoot = flick.overShoot > 0 ? 0 : 30
}
diff --git a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml b/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml
index 70018b6..0adfa02 100644
--- a/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml
+++ b/tests/auto/declarative/visual/qmlgraphicspathview/test-pathview.qml
@@ -22,7 +22,7 @@ Rectangle {
width: 85; height: 85; color: lColor
scale: wrapper.PathView.scale
- MouseRegion { anchors.fill: parent }
+ MouseArea { anchors.fill: parent }
transform: Rotation {
id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
diff --git a/tests/auto/declarative/visual/qmlmouseregion/drag.qml b/tests/auto/declarative/visual/qmlmouseregion/drag.qml
index ab4c280..dbb2a24 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/drag.qml
+++ b/tests/auto/declarative/visual/qmlmouseregion/drag.qml
@@ -8,7 +8,7 @@ Rectangle{
id: draggable
width:40; height:40; color: "lightsteelblue"
y:20
- MouseRegion{
+ MouseArea{
anchors.fill: parent
drag.target: draggable
drag.axis: "XandYAxis"
diff --git a/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml b/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml
index ab4223d..3c722d0 100644
--- a/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml
+++ b/tests/auto/declarative/visual/qmlmouseregion/mouseregion.qml
@@ -9,7 +9,7 @@ Rectangle {
Rectangle {
width: 98; height: 48
color: "red"
- MouseRegion {
+ MouseArea {
id: mr1
anchors.fill: parent
enabled: false
@@ -22,7 +22,7 @@ Rectangle {
x: 100
width: 98; height: 48
color: "red"
- MouseRegion {
+ MouseArea {
id: mr2
anchors.fill: parent
acceptedButtons: Qt.RightButton
@@ -42,7 +42,7 @@ Rectangle {
x: 200
width: 98; height: 48
color: "red"
- MouseRegion {
+ MouseArea {
id: mr3
anchors.fill: parent
onPressAndHold: {
@@ -56,7 +56,7 @@ Rectangle {
x: 300
width: 98; height: 48
color: "red"
- MouseRegion {
+ MouseArea {
id: mr4
anchors.fill: parent
onPressed: {
@@ -74,7 +74,7 @@ Rectangle {
y: 50
width: 98; height: 48
color: "red"
- MouseRegion {
+ MouseArea {
id: mr5
anchors.fill: parent
hoverEnabled: true
@@ -93,7 +93,7 @@ Rectangle {
y: 50
width: 98; height: 48
color: "red"
- MouseRegion {
+ MouseArea {
id: mr6
anchors.fill: parent
onClicked: {
@@ -111,7 +111,7 @@ Rectangle {
y: 50
width: 98; height: 48
color: "red"
- MouseRegion {
+ MouseArea {
id: mr7
anchors.fill: parent
enabled: false
diff --git a/tests/auto/declarative/visual/qmlspringfollow/follow.qml b/tests/auto/declarative/visual/qmlspringfollow/follow.qml
index 8a713a2..a85a778 100644
--- a/tests/auto/declarative/visual/qmlspringfollow/follow.qml
+++ b/tests/auto/declarative/visual/qmlspringfollow/follow.qml
@@ -44,7 +44,7 @@ Rectangle {
}
// Follow mouse
- MouseRegion {
+ MouseArea {
id: mouseRegion
anchors.fill: parent
Rectangle {
diff --git a/tests/auto/declarative/visual/selftest_noimages/selftest_noimages.qml b/tests/auto/declarative/visual/selftest_noimages/selftest_noimages.qml
index 21a19bc..da7f9b6 100644
--- a/tests/auto/declarative/visual/selftest_noimages/selftest_noimages.qml
+++ b/tests/auto/declarative/visual/selftest_noimages/selftest_noimages.qml
@@ -2,7 +2,7 @@ import Qt 4.6
Text {
property string error: "not pressed"
text: (new Date()).valueOf()
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onPressed: error=""
}
diff --git a/tests/auto/declarative/visual/webview/settings/noAutoLoadImages.qml b/tests/auto/declarative/visual/webview/settings/noAutoLoadImages.qml
index 2478932..72e672d 100644
--- a/tests/auto/declarative/visual/webview/settings/noAutoLoadImages.qml
+++ b/tests/auto/declarative/visual/webview/settings/noAutoLoadImages.qml
@@ -11,7 +11,7 @@ Grid {
anchors.fill: parent
settings.autoLoadImages: false
url: "test-img.html"
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: { parent.settings.autoLoadImages=true; label.text=""; parent.reload.trigger() }
}