summaryrefslogtreecommitdiffstats
path: root/demos/declarative/twitter
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-02-16 01:59:27 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-02-18 05:17:13 (GMT)
commitad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6 (patch)
tree144a7a8f3208d9388b8666d26aa0a231b325b87f /demos/declarative/twitter
parent635b329592f26d64eeb6212b6056249b15293dcf (diff)
downloadQt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.zip
Qt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.tar.gz
Qt-ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6.tar.bz2
Get rid of the matchProperties/properties distinction, as it
has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
Diffstat (limited to 'demos/declarative/twitter')
-rw-r--r--demos/declarative/twitter/content/HomeTitleBar.qml2
-rw-r--r--demos/declarative/twitter/content/MultiTitleBar.qml2
-rw-r--r--demos/declarative/twitter/content/TitleBar.qml2
-rw-r--r--demos/declarative/twitter/twitter.qml2
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/declarative/twitter/content/HomeTitleBar.qml b/demos/declarative/twitter/content/HomeTitleBar.qml
index c48befd..8054f2e 100644
--- a/demos/declarative/twitter/content/HomeTitleBar.qml
+++ b/demos/declarative/twitter/content/HomeTitleBar.qml
@@ -115,7 +115,7 @@ Item {
transitions: [
Transition {
from: "*"; to: "*"
- NumberAnimation { matchProperties: "x,y,width,height"; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x,y,width,height"; easing: "easeInOutQuad" }
}
]
}
diff --git a/demos/declarative/twitter/content/MultiTitleBar.qml b/demos/declarative/twitter/content/MultiTitleBar.qml
index ef8a450..ef7de65 100644
--- a/demos/declarative/twitter/content/MultiTitleBar.qml
+++ b/demos/declarative/twitter/content/MultiTitleBar.qml
@@ -18,7 +18,7 @@ Item {
}
]
transitions: [
- Transition { NumberAnimation { matchProperties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
+ Transition { NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
]
}
diff --git a/demos/declarative/twitter/content/TitleBar.qml b/demos/declarative/twitter/content/TitleBar.qml
index 28e7389..42a6115 100644
--- a/demos/declarative/twitter/content/TitleBar.qml
+++ b/demos/declarative/twitter/content/TitleBar.qml
@@ -72,6 +72,6 @@ Item {
}
transitions: Transition {
- NumberAnimation { matchProperties: "x"; easing: "easeInOutQuad" }
+ NumberAnimation { properties: "x"; easing: "easeInOutQuad" }
}
}
diff --git a/demos/declarative/twitter/twitter.qml b/demos/declarative/twitter/twitter.qml
index bb7da9c..d2abf28 100644
--- a/demos/declarative/twitter/twitter.qml
+++ b/demos/declarative/twitter/twitter.qml
@@ -89,7 +89,7 @@ Item {
}
]
transitions: [
- Transition { NumberAnimation { matchProperties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
+ Transition { NumberAnimation { properties: "x,y"; duration: 500; easing: "easeInOutQuad" } }
]
}
}