summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-10 00:38:04 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-10 00:38:04 (GMT)
commit9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72 (patch)
tree8b2a12fbf2cd035b7980cc91b1bce0c8a12f2127 /tools
parent2b7de14b26de6f38b73b691c881f1c8f7be1a354 (diff)
parenta6b3fdccab1a4d3ed941ba069dc632aa9c8dc755 (diff)
downloadQt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.zip
Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.tar.gz
Qt-9c3293c00d2e1f72c76ce9f771fc3d74e43f8e72.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/content/Browser.qml10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
index 35120bc..62996ef 100644
--- a/tools/qml/content/Browser.qml
+++ b/tools/qml/content/Browser.qml
@@ -137,12 +137,12 @@ Rectangle {
Transition {
to: "current"
SequentialAnimation {
- NumberAnimation { matchProperties: "x"; duration: 250 }
+ NumberAnimation { properties: "x"; duration: 250 }
}
},
Transition {
- NumberAnimation { matchProperties: "x"; duration: 250 }
- NumberAnimation { matchProperties: "x"; duration: 250 }
+ NumberAnimation { properties: "x"; duration: 250 }
+ NumberAnimation { properties: "x"; duration: 250 }
}
]
Keys.onPressed: { root.keyPressed = true; }
@@ -177,11 +177,11 @@ Rectangle {
Transition {
to: "current"
SequentialAnimation {
- NumberAnimation { matchProperties: "x"; duration: 250 }
+ NumberAnimation { properties: "x"; duration: 250 }
}
},
Transition {
- NumberAnimation { matchProperties: "x"; duration: 250 }
+ NumberAnimation { properties: "x"; duration: 250 }
}
]
Keys.onPressed: { root.keyPressed = true; }