summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-03-26 05:57:19 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-03-28 23:50:08 (GMT)
commitfbcf257f0988f1ffef442195acc9f4b4c1527870 (patch)
tree089261bfcca4caf355276c6caf4ebf27f04f1047 /tests
parent078ff776e37aebe5b7e88e4b4f21da1158fac3c7 (diff)
downloadQt-fbcf257f0988f1ffef442195acc9f4b4c1527870.zip
Qt-fbcf257f0988f1ffef442195acc9f4b4c1527870.tar.gz
Qt-fbcf257f0988f1ffef442195acc9f4b4c1527870.tar.bz2
Syntax and other small fixes for the visual tests.
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/visual/ListView/basic3.qml2
-rw-r--r--tests/auto/declarative/visual/ListView/basic4.qml2
-rw-r--r--tests/auto/declarative/visual/Package_Views/packageviews.qml4
-rw-r--r--tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.0.pngbin610 -> 627 bytes
-rw-r--r--tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.pngbin610 -> 626 bytes
-rw-r--r--tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.2.pngbin610 -> 625 bytes
-rw-r--r--tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.qml248
-rw-r--r--tests/auto/declarative/visual/animation/loop/loop.qml2
-rw-r--r--tests/auto/declarative/visual/animation/parentAnimation/parentAnimation.qml10
-rw-r--r--tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml13
-rw-r--r--tests/auto/declarative/visual/focusscope/test3.qml2
-rw-r--r--tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml4
-rw-r--r--tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml12
-rw-r--r--tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml4
-rw-r--r--tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml6
-rw-r--r--tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml12
-rw-r--r--tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml14
-rw-r--r--tests/auto/declarative/visual/webview/zooming/renderControl.qml2
-rw-r--r--tests/auto/declarative/visual/webview/zooming/resolution.qml15
-rw-r--r--tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml11
-rw-r--r--tests/auto/declarative/visual/webview/zooming/zooming.qml6
21 files changed, 192 insertions, 177 deletions
diff --git a/tests/auto/declarative/visual/ListView/basic3.qml b/tests/auto/declarative/visual/ListView/basic3.qml
index 05ac358..2d68c0a 100644
--- a/tests/auto/declarative/visual/ListView/basic3.qml
+++ b/tests/auto/declarative/visual/ListView/basic3.qml
@@ -5,7 +5,7 @@ Rectangle {
width: 200
height: 300
id: page
- Listmodel {
+ ListModel {
id: model
ListElement {
name: "January"
diff --git a/tests/auto/declarative/visual/ListView/basic4.qml b/tests/auto/declarative/visual/ListView/basic4.qml
index 3628bd3..7c68df1 100644
--- a/tests/auto/declarative/visual/ListView/basic4.qml
+++ b/tests/auto/declarative/visual/ListView/basic4.qml
@@ -5,7 +5,7 @@ Rectangle {
width: 200
height: 300
id: page
- Listmodel {
+ ListModel {
id: model
ListElement {
name: "January"
diff --git a/tests/auto/declarative/visual/Package_Views/packageviews.qml b/tests/auto/declarative/visual/Package_Views/packageviews.qml
index cf3f9f7..f6c033f 100644
--- a/tests/auto/declarative/visual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/visual/Package_Views/packageviews.qml
@@ -6,9 +6,9 @@ Rectangle {
height: 200
color: "black"
- VisualDatamodel {
+ VisualDataModel {
id: model
- model: Listmodel {
+ model: ListModel {
ListElement { itemColor: "red" }
ListElement { itemColor: "green" }
ListElement { itemColor: "blue" }
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.0.png b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.0.png
index f4a6cfd..e6ea16d 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.0.png
+++ b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.0.png
Binary files differ
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.png b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.png
index f4a6cfd..b75ba61 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.png
+++ b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.1.png
Binary files differ
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.2.png b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.2.png
index f4a6cfd..4320f6f 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.2.png
+++ b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.2.png
Binary files differ
diff --git a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.qml b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.qml
index 900bf5c..4d0959a 100644
--- a/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.qml
+++ b/tests/auto/declarative/visual/animation/colorAnimation/data/colorAnimation.qml
@@ -170,91 +170,91 @@ VisualTest {
}
Frame {
msec: 608
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "acc736435c9f84aa82941ba561bc5dbc"
}
Frame {
msec: 624
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "e5bda0daf98288ce18db6ce06eda3ba0"
}
Frame {
msec: 640
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "d35008f75b8c992f80fb16ba7203649d"
}
Frame {
msec: 656
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "14f43e0784ddf42ea8550db88c501bf1"
}
Frame {
msec: 672
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "02276e158b5391480b1bdeaadf1fb903"
}
Frame {
msec: 688
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "35d9513eb97a2c482b7cd197de910934"
}
Frame {
msec: 704
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "faf0fd681e60bb2489099f5df772b6cd"
}
Frame {
msec: 720
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a863d3e346f94785a3a392fdc91526eb"
}
Frame {
msec: 736
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "fdf328d3f6eb8410da59a91345e41a44"
}
Frame {
msec: 752
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "83514a3b10d5be8f6c3b128d0f3e0b1c"
}
Frame {
msec: 768
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "ead0eae76cd00189075964671effbaea"
}
Frame {
msec: 784
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "24d2457fcd51490fda23071bf9929d12"
}
Frame {
msec: 800
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "1478683446cf543dacbe31d0b76a98a6"
}
Frame {
msec: 816
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "99f7da1f31fe920f6c02add4042ae925"
}
Frame {
msec: 832
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "22def892006cf66667770b0f17baf6c0"
}
Frame {
msec: 848
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "6a36d5a77099bfd58baf285478ff04e4"
}
Frame {
msec: 864
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "6258150666b59b20ab476724c07fc20c"
}
Frame {
msec: 880
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "f1636315bc950a6dd400d9c7ed263b88"
}
Frame {
msec: 896
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "18447ea8dc2e8da956788e5b3cf3790a"
}
Frame {
msec: 912
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "1d2a6e65997a73e9e670356c8e8b63b2"
}
Frame {
msec: 928
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "bed0242c0f9ef229d1392835286d5782"
}
Frame {
msec: 944
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "88923c190e9e5beadef8a409c06df9d6"
}
Frame {
msec: 960
@@ -262,239 +262,239 @@ VisualTest {
}
Frame {
msec: 976
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "85b1821cc50f2a9f3ed6944f792b7a2f"
}
Frame {
msec: 992
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "395195716d76bc0be7b2033ed37a7a1c"
}
Frame {
msec: 1008
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "243dbffcf416926242bbcb7348974c4c"
}
Frame {
msec: 1024
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a755068679616d8ac65c2aa7431f2a19"
}
Frame {
msec: 1040
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "e8249b35a47eb492cbdf2d91cc8426f0"
}
Frame {
msec: 1056
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "15f3da1c0e6f0779b96859d51171dd27"
}
Frame {
msec: 1072
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "258c0c756aac3de743b43051f2aace6b"
}
Frame {
msec: 1088
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a58b9fdf301d72b2cc5c93934cc8927b"
}
Frame {
msec: 1104
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a9181d30870d472521f8904818ce520f"
}
Frame {
msec: 1120
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "7f9e94069ccf3897c26a71bd7becd903"
}
Frame {
msec: 1136
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "bdf305c2f46cdb86dbf57b1e0cc5a65b"
}
Frame {
msec: 1152
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "fe5b6865d7e4fc7d1d42c1e74f8666f7"
}
Frame {
msec: 1168
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "734f0de45a6e34c9eab7ef606196f96a"
}
Frame {
msec: 1184
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "02a361c4534fdf7f286dc3e6dc23275c"
}
Frame {
msec: 1200
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "e649155ad69999c14b92f6561e4d1185"
}
Frame {
msec: 1216
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "01af177084fab755d622973f64b92018"
}
Frame {
msec: 1232
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "097cc4a082dfab995d213a3a73883c97"
}
Frame {
msec: 1248
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "d7b4239a3280b1eb8e885e3f422df8e9"
}
Frame {
msec: 1264
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "59893977994e34e83f91e7ce3ad65d6d"
}
Frame {
msec: 1280
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b68e3fbb5cdcd6bd96df7dec558db42b"
}
Frame {
msec: 1296
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "94ad0580648f36a1e18a9ea7e249b04d"
}
Frame {
msec: 1312
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "750a4c01d2f5806a89a1c6cc6a9b9a68"
}
Frame {
msec: 1328
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "4f109f50f388f1bfa4bc6b03b3e6e514"
}
Frame {
msec: 1344
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "c6168d5cf27a533e8ee636637667be47"
}
Frame {
msec: 1360
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "f8120547bed987aa34c00da5a01a4d1e"
}
Frame {
msec: 1376
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "cbff526136fa2c128c8b898fbbef9e5c"
}
Frame {
msec: 1392
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "f29e52398fab1a239a63df4c32f2fc69"
}
Frame {
msec: 1408
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "7178bfe86fd2fd513218b33760460f8d"
}
Frame {
msec: 1424
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "ca83285bc8ac633403896fe976896eb0"
}
Frame {
msec: 1440
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "96ba486c09cc69d5aa38c46c00df1181"
}
Frame {
msec: 1456
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b88eab335842787869f4a14824c19dd8"
}
Frame {
msec: 1472
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "065aa59012729e1e1a246a2083142690"
}
Frame {
msec: 1488
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "dd0e98c8398861002c5f178c5f9f612d"
}
Frame {
msec: 1504
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "04192c2b545948048eccf4d81bbde198"
}
Frame {
msec: 1520
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "bb7502c7208281ef9fd41714ab88a1a8"
}
Frame {
msec: 1536
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "5397195471890d08b703dca101e5bc7c"
}
Frame {
msec: 1552
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "4c678cdbebb2ffd2cbf012ca77800cde"
}
Frame {
msec: 1568
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "0d7a34ecd0c7f52b2c015037bf1902c6"
}
Frame {
msec: 1584
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "fd9d5048be749ac4369fda2d018b43ae"
}
Frame {
msec: 1600
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "93ee03795cd57ae6f7fe3a020b039ad4"
}
Frame {
msec: 1616
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "5e1118963f219c39761ca7fbf564a9ca"
}
Frame {
msec: 1632
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "8f40038741903150136170503649d941"
}
Frame {
msec: 1648
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b087b7d0aa6224821f8e18718ff5e77d"
}
Frame {
msec: 1664
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "aa46b04a3c67dc772265ed2901955565"
}
Frame {
msec: 1680
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "ac024bf2aeb4becdf31a09fe0a6db8f3"
}
Frame {
msec: 1696
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "13745a174e4d06e2108a5bf125ba50cc"
}
Frame {
msec: 1712
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "bd972f0d8e230eca0b3fea1b8c960c08"
}
Frame {
msec: 1728
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "cbdbec802a58e7ced0cf45b3ab0bc0ba"
}
Frame {
msec: 1744
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "5128584c50305c7d218b81b8367fa3d5"
}
Frame {
msec: 1760
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a71461d3593f3685620668916de870bd"
}
Frame {
msec: 1776
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "74ebac8f32cf044b58d9883dbcd9a722"
}
Frame {
msec: 1792
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "fedc5b638f339b90fe59b478721e65b7"
}
Frame {
msec: 1808
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "8593a81be812edf54ec94da8ae9c1314"
}
Frame {
msec: 1824
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "4e9b083075bc5e9287a8abc982778b56"
}
Frame {
msec: 1840
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "1d6f02aa99afa47d77fc49ab894b365a"
}
Frame {
msec: 1856
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a204feec783b3b05de4c209c21745826"
}
Frame {
msec: 1872
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "665a2a8ff00b9663157802767f504754"
}
Frame {
msec: 1888
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "624fb09ebe60cb87d767faf8d2420b1e"
}
Frame {
msec: 1904
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "e5af0cdc33f3275a25abb09e9165f310"
}
Frame {
msec: 1920
@@ -502,171 +502,171 @@ VisualTest {
}
Frame {
msec: 1936
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "e7aa6374c73832e57ceb2427a1e258aa"
}
Frame {
msec: 1952
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b5abd0dff1ab076faac7cc226e83f5d0"
}
Frame {
msec: 1968
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b759acc35bccff8efc2e6fe276ddc0f7"
}
Frame {
msec: 1984
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "ce52e18c1f7732768779863b45314ff5"
}
Frame {
msec: 2000
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "99d30652559dd6931e0c95543eeaa149"
}
Frame {
msec: 2016
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "ffbd9a00e05e085b89296d19d5caec57"
}
Frame {
msec: 2032
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "9c9d658b9c25602816b8066bf19105db"
}
Frame {
msec: 2048
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "2b7fd058e6601e22a30bb7106b1c683b"
}
Frame {
msec: 2064
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "f4c7e26b19ee0a3e7c9688685eb7bd05"
}
Frame {
msec: 2080
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "0dc6d593bceff56b7f81f2a49d37fefb"
}
Frame {
msec: 2096
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "9bfd7ad5091ccbdde43c593e133a7b10"
}
Frame {
msec: 2112
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "2703b617937914a90ea42ebf249d79ee"
}
Frame {
msec: 2128
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b77e2983138254016c4cca53100f46fa"
}
Frame {
msec: 2144
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "60c4dd24187d1281081479e586f02b37"
}
Frame {
msec: 2160
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "62f2511abd99ef1231c9fa4b91d4abfe"
}
Frame {
msec: 2176
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "e309b3353fd174e883d309571caddc98"
}
Frame {
msec: 2192
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "1e2d6a134c7b12dde551b148ef4f088c"
}
Frame {
msec: 2208
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "e5dc5450604a491cc24a0dcf5c278b58"
}
Frame {
msec: 2224
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "c8dae97c10e1962c1e6a51ab3ab8579e"
}
Frame {
msec: 2240
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "4e1b7e06f55fb084080689b474f1fe1d"
}
Frame {
msec: 2256
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b4639c907fa937bf15fac62421170cd8"
}
Frame {
msec: 2272
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "c250208a0caeb5f6cb4d3aac3d7d350b"
}
Frame {
msec: 2288
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a73351eabecf0d71149efe31f197413e"
}
Frame {
msec: 2304
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "479425f1b7aff79e4dfb7fca534af018"
}
Frame {
msec: 2320
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "046d0f0040a52d1f26ba9f7c5de06ef4"
}
Frame {
msec: 2336
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "655778bf13c6080903150b0eb43a7edc"
}
Frame {
msec: 2352
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "72da0bbe81514870655fdd3354adac60"
}
Frame {
msec: 2368
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "defe0bdf675c65fff55aaaced1e4dae7"
}
Frame {
msec: 2384
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "c988628b6c3d3780e9a865c7694926cd"
}
Frame {
msec: 2400
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "5ab17563655231089edd986ff13d6012"
}
Frame {
msec: 2416
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "c1adff1d2e5800ed466d1691d3b17382"
}
Frame {
msec: 2432
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "70129ba01fbb19592b9dc0d0a3b3e7df"
}
Frame {
msec: 2448
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "0000829ef7ed908bf430d42904d59cc2"
}
Frame {
msec: 2464
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "843d2927f50ab87b4a86b7a6aaeed91f"
}
Frame {
msec: 2480
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "da86d21756025e7de8050586d5e2a1f8"
}
Frame {
msec: 2496
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "48dd1bd6580133b0793fee327ea4f1e6"
}
Frame {
msec: 2512
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "f0618193dcd0ba2837249515a1898b1c"
}
Frame {
msec: 2528
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "a530184e57251065286c0cbba7301e9c"
}
Frame {
msec: 2544
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "64a1d7203973d65dd342793007a61c58"
}
Frame {
msec: 2560
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "5b830dfc6ba442772de87d75d5a578de"
}
Frame {
msec: 2576
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "5563b056b0409b65f60dd16dd0dd890e"
}
Frame {
msec: 2592
- hash: "8c0fcda4f8956394c53fc4ba18caa850"
+ hash: "b8bcf9ad2ca8720c11563a23d8280804"
}
Frame {
msec: 2608
@@ -931,7 +931,7 @@ VisualTest {
Key {
type: 6
key: 16777249
- modifiers: 0
+ modifiers: 67108864
text: ""
autorep: false
count: 1
diff --git a/tests/auto/declarative/visual/animation/loop/loop.qml b/tests/auto/declarative/visual/animation/loop/loop.qml
index 927e103..5389b26 100644
--- a/tests/auto/declarative/visual/animation/loop/loop.qml
+++ b/tests/auto/declarative/visual/animation/loop/loop.qml
@@ -13,7 +13,7 @@ Rectangle {
to 100, jumps to 200, animates smoothly to 400, animates smoothly
back to 100, jumps to 200, and so on.
*/
- x: SequentialAnimation {
+ SequentialAnimation on x {
loops: Animation.Infinite
NumberAnimation { to: 100; duration: 1000 }
NumberAnimation { from: 200; to: 400; duration: 1000 }
diff --git a/tests/auto/declarative/visual/animation/parentAnimation/parentAnimation.qml b/tests/auto/declarative/visual/animation/parentAnimation/parentAnimation.qml
index 5db2cc6..8d0b375 100644
--- a/tests/auto/declarative/visual/animation/parentAnimation/parentAnimation.qml
+++ b/tests/auto/declarative/visual/animation/parentAnimation/parentAnimation.qml
@@ -1,4 +1,14 @@
import Qt 4.6
+
+/*
+This test shows a green rectangle moving and growing from the upper-left corner
+of the black rectangle to the same position as the red rectangle (it should end up
+the same height as the red rect and twice as wide). There should be no odd jumps or clipping seen.
+
+The test shows one full transition (to the red and back), then several partial transitions, and
+then a final full transition.
+*/
+
Rectangle {
width: 800;
height: 480;
diff --git a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
index 4562aa7..8830170 100644
--- a/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
+++ b/tests/auto/declarative/visual/animation/pauseAnimation/pauseAnimation.qml
@@ -1,5 +1,12 @@
import Qt 4.6
+/*
+This test shows a bouncing logo.
+When the test starts the logo should be resting at the bottom. It should immediately move
+to the top, and then fall down to bounce at the bottom. There should be a pause, and then
+one repeat of the sequence.
+*/
+
Rectangle {
id: rect
width: 120
@@ -9,15 +16,15 @@ Rectangle {
id: img
source: "pics/qtlogo.png"
x: 60-width/2
- y: 200-height
- y: SequentialAnimation {
+ y: 100
+ SequentialAnimation on y {
loops: Animation.Infinite
NumberAnimation {
to: 0; duration: 500
easing.type: "InOutQuad"
}
NumberAnimation {
- to: 200-img.height
+ to: 100
easing.type: "OutBounce"
duration: 2000
}
diff --git a/tests/auto/declarative/visual/focusscope/test3.qml b/tests/auto/declarative/visual/focusscope/test3.qml
index 855bdc5..a8bb523 100644
--- a/tests/auto/declarative/visual/focusscope/test3.qml
+++ b/tests/auto/declarative/visual/focusscope/test3.qml
@@ -5,7 +5,7 @@ Rectangle {
width: 800
height: 600
- Listmodel {
+ ListModel {
id: model
ListElement { name: "1" }
ListElement { name: "2" }
diff --git a/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml b/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
index c3006d5..58d03a6 100644
--- a/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
+++ b/tests/auto/declarative/visual/qdeclarativeborderimage/content/MyBorderImage.qml
@@ -18,13 +18,13 @@ Item {
BorderImage {
id: image; x: container.width / 2 - width / 2; y: container.height / 2 - height / 2
- width: SequentialAnimation {
+ SequentialAnimation on width {
loops: Animation.Infinite
NumberAnimation { from: container.minWidth; to: container.maxWidth; duration: 2000; easing.type: "InOutQuad"}
NumberAnimation { from: container.maxWidth; to: container.minWidth; duration: 2000; easing.type: "InOutQuad" }
}
- height: SequentialAnimation {
+ SequentialAnimation on height {
loops: Animation.Infinite
NumberAnimation { from: container.minHeight; to: container.maxHeight; duration: 2000; easing.type: "InOutQuad"}
NumberAnimation { from: container.maxHeight; to: container.minHeight; duration: 2000; easing.type: "InOutQuad" }
diff --git a/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml b/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
index 99a9973..121328b 100644
--- a/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
+++ b/tests/auto/declarative/visual/qdeclarativeeasefollow/easefollow.qml
@@ -6,7 +6,7 @@ Rectangle {
Rectangle {
id: rect
width: 50; height: 20; y: 30; color: "black"
- x: SequentialAnimation {
+ SequentialAnimation on x {
loops: Animation.Infinite
NumberAnimation { from: 50; to: 700; duration: 2000 }
NumberAnimation { from: 700; to: 50; duration: 2000 }
@@ -15,26 +15,26 @@ Rectangle {
Rectangle {
width: 50; height: 20; y: 60; color: "red"
- x: EaseFollow { source: rect.x; velocity: 400 }
+ EaseFollow on x { source: rect.x; velocity: 400 }
}
Rectangle {
width: 50; height: 20; y: 90; color: "yellow"
- x: EaseFollow { source: rect.x; velocity: 300; reversingMode: EaseFollow.Immediate }
+ EaseFollow on x { source: rect.x; velocity: 300; reversingMode: EaseFollow.Immediate }
}
Rectangle {
width: 50; height: 20; y: 120; color: "green"
- x: EaseFollow { source: rect.x; reversingMode: EaseFollow.Sync }
+ EaseFollow on x { source: rect.x; reversingMode: EaseFollow.Sync }
}
Rectangle {
width: 50; height: 20; y: 150; color: "purple"
- x: EaseFollow { source: rect.x; maximumEasingTime: 200 }
+ EaseFollow on x { source: rect.x; maximumEasingTime: 200 }
}
Rectangle {
width: 50; height: 20; y: 180; color: "blue"
- x: EaseFollow { source: rect.x; duration: 300 }
+ EaseFollow on x { source: rect.x; duration: 300 }
}
}
diff --git a/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
index 81d06cf..f4fb863 100644
--- a/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
+++ b/tests/auto/declarative/visual/qdeclarativegridview/gridview2.qml
@@ -49,8 +49,8 @@ Rectangle {
Rectangle {
color: "transparent"; border.color: "white"; border.width: 8; z: 3000
height: 100; width: 100; x: 4; y: 4
- x: EaseFollow { source: gridView.currentItem.x; velocity: 500 }
- y: EaseFollow { source: gridView.currentItem.y; velocity: 500 }
+ EaseFollow on x { source: gridView.currentItem.x; velocity: 500 }
+ EaseFollow on y { source: gridView.currentItem.y; velocity: 500 }
}
]
}
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
index 04bbabc..21bbc7f 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/clock.qml
@@ -23,7 +23,7 @@ Rectangle {
transform: Rotation {
id: hourRotation
origin.x: 7.5; origin.y: 73; angle: 0
- angle: SpringFollow {
+ SpringFollow on angle {
spring: 2; damping: 0.2; modulus: 360
source: (clock.hours * 30) + (clock.minutes * 0.5)
}
@@ -37,7 +37,7 @@ Rectangle {
transform: Rotation {
id: minuteRotation
origin.x: 6.5; origin.y: 83; angle: 0
- angle: SpringFollow {
+ SpringFollow on angle {
spring: 2; damping: 0.2; modulus: 360
source: clock.minutes * 6
}
@@ -51,7 +51,7 @@ Rectangle {
transform: Rotation {
id: secondRotation
origin.x: 2.5; origin.y: 80; angle: 0
- angle: SpringFollow {
+ SpringFollow on angle {
spring: 5; damping: 0.25; modulus: 360
source: clock.seconds * 6
}
diff --git a/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml b/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
index e9c94c7..1659bb7 100644
--- a/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
+++ b/tests/auto/declarative/visual/qdeclarativespringfollow/follow.qml
@@ -7,7 +7,7 @@ Rectangle {
id: rect
color: "#00ff00"
y: 200; width: 60; height: 20
- y: SequentialAnimation {
+ SequentialAnimation on y {
loops: Animation.Infinite
NumberAnimation {
to: 20; duration: 500
@@ -26,7 +26,7 @@ Rectangle {
color: "#ff0000"
x: rect.width; width: rect.width; height: 20
y: 200
- y: SpringFollow { source: rect.y; velocity: 200 }
+ SpringFollow on y { source: rect.y; velocity: 200 }
}
// Spring
@@ -34,13 +34,13 @@ Rectangle {
color: "#ff0000"
x: rect.width * 2; width: rect.width/2; height: 20
y: 200
- y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2 }
+ SpringFollow on y { source: rect.y; spring: 1.0; damping: 0.2 }
}
Rectangle {
color: "#880000"
x: rect.width * 2.5; width: rect.width/2; height: 20
y: 200
- y: SpringFollow { source: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
+ SpringFollow on y { source: rect.y; spring: 1.0; damping: 0.2; mass: 3.0 } // "heavier" object
}
// Follow mouse
@@ -52,8 +52,8 @@ Rectangle {
width: 20; height: 20
radius: 10
color: "#0000ff"
- x: SpringFollow { id: f1; source: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
- y: SpringFollow { id: f2; source: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+ SpringFollow on x { id: f1; source: mouseRegion.mouseX-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
+ SpringFollow on y { id: f2; source: mouseRegion.mouseY-10; spring: 1.0; damping: 0.05; epsilon: 0.25 }
states: [
State {
name: "following"
diff --git a/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
index 199f71f..09f16ab 100644
--- a/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
+++ b/tests/auto/declarative/visual/qdeclarativetextinput/cursorDelegate.qml
@@ -3,17 +3,17 @@ import Qt 4.6
resources: [
Component { id: cursorA
Item { id: cPage;
- x: Behavior { NumberAnimation { } }
- y: Behavior { NumberAnimation { } }
- height: Behavior { NumberAnimation { duration: 200 } }
+ Behavior on x { NumberAnimation { } }
+ Behavior on y { NumberAnimation { } }
+ Behavior on height { NumberAnimation { duration: 200 } }
Rectangle { id: cRectangle; color: "black"; y: 1; width: 1; height: parent.height-2;
Rectangle { id:top; color: "black"; width: 3; height: 1; x: -1; y:0}
Rectangle { id:bottom; color: "black"; width: 3; height: 1; x: -1; anchors.bottom: parent.bottom;}
opacity: 1
- opacity: SequentialAnimation { running: cPage.parent.focus == true; loops: Animation.Infinite;
- NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
- NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
- }
+ SequentialAnimation on opacity { running: cPage.parent.focus == true; loops: Animation.Infinite;
+ NumberAnimation { properties: "opacity"; to: 1; duration: 500; easing.type: "InQuad"}
+ NumberAnimation { properties: "opacity"; to: 0; duration: 500; easing.type: "OutQuad"}
+ }
}
width: 1;
}
diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.qml b/tests/auto/declarative/visual/webview/zooming/renderControl.qml
index bcbcf5c..52a569e 100644
--- a/tests/auto/declarative/visual/webview/zooming/renderControl.qml
+++ b/tests/auto/declarative/visual/webview/zooming/renderControl.qml
@@ -9,7 +9,7 @@ Rectangle {
id: webview
width: 400
url: "renderControl.html"
- x: SequentialAnimation {
+ SequentialAnimation on x {
loops: Animation.Infinite
NumberAnimation { from: 100; to: 0; duration: 200 }
PropertyAction { target: webview; property: "renderingEnabled"; value: false }
diff --git a/tests/auto/declarative/visual/webview/zooming/resolution.qml b/tests/auto/declarative/visual/webview/zooming/resolution.qml
index bce6744..d6c35d4 100644
--- a/tests/auto/declarative/visual/webview/zooming/resolution.qml
+++ b/tests/auto/declarative/visual/webview/zooming/resolution.qml
@@ -6,12 +6,11 @@ WebView {
height: 250 * zoomFactor
scale: 1/zoomFactor
url: "resolution.html"
- zoomFactor:
- SequentialAnimation {
- loops: Animation.Infinite
- NumberAnimation { from: 1; to: 0.25; duration: 2000 }
- NumberAnimation { from: 0.25; to: 1; duration: 2000 }
- NumberAnimation { from: 1; to: 5; duration: 2000 }
- NumberAnimation { from: 5; to: 1; duration: 2000 }
- }
+ SequentialAnimation on zoomFactor {
+ loops: Animation.Infinite
+ NumberAnimation { from: 1; to: 0.25; duration: 2000 }
+ NumberAnimation { from: 0.25; to: 1; duration: 2000 }
+ NumberAnimation { from: 1; to: 5; duration: 2000 }
+ NumberAnimation { from: 5; to: 1; duration: 2000 }
+ }
}
diff --git a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml
index 6d51c8a..741450f 100644
--- a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml
+++ b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml
@@ -6,10 +6,9 @@ WebView {
height: 250
url: "zoomTextOnly.html"
settings.zoomTextOnly: true
- zoomFactor:
- SequentialAnimation {
- loops: Animation.Infinite
- NumberAnimation { from: 2; to: 0.25; duration: 1000 }
- NumberAnimation { from: 0.25; to: 2; duration: 1000 }
- }
+ SequentialAnimation on zoomFactor {
+ loops: Animation.Infinite
+ NumberAnimation { from: 2; to: 0.25; duration: 1000 }
+ NumberAnimation { from: 0.25; to: 2; duration: 1000 }
+ }
}
diff --git a/tests/auto/declarative/visual/webview/zooming/zooming.qml b/tests/auto/declarative/visual/webview/zooming/zooming.qml
index 9f0b865..adbd7a5 100644
--- a/tests/auto/declarative/visual/webview/zooming/zooming.qml
+++ b/tests/auto/declarative/visual/webview/zooming/zooming.qml
@@ -7,9 +7,9 @@ import org.webkit 1.0
WebView {
width: 200
height: 250
- x: Behavior { NumberAnimation { } }
- y: Behavior { NumberAnimation { } }
- scale: Behavior { NumberAnimation { } }
+ Behavior on x { NumberAnimation { } }
+ Behavior on y { NumberAnimation { } }
+ Behavior on scale { NumberAnimation { } }
url: "zooming.html"
preferredWidth: width
preferredHeight: height