diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-16 01:59:27 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-18 05:17:13 (GMT) |
| commit | ad2b2c698d90d04aebe1f6d05c3a4eb992c0e7b6 (patch) | |
| tree | 144a7a8f3208d9388b8666d26aa0a231b325b87f /demos/declarative/webbrowser/content | |
| parent | 635b329592f26d64eeb6212b6056249b15293dcf (diff) | |
| download | Qt-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/webbrowser/content')
| -rw-r--r-- | demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml | 4 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/content/fieldtext/FieldText.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml index a7e6a97..e58ab0a 100644 --- a/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml +++ b/demos/declarative/webbrowser/content/RetractingWebBrowserHeader.qml @@ -96,8 +96,8 @@ Image { transitions: [ Transition { NumberAnimation { - matchTargets: header - matchProperties: "progressOff" + targets: header + properties: "progressOff" easing: "easeInOutQuad" duration: 300 } diff --git a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml index 6b1d271..b1c1938 100644 --- a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml +++ b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml @@ -149,7 +149,7 @@ Item { to: "*" reversible: true NumberAnimation { - matchProperties: "opacity,leftMargin,rightMargin" + properties: "opacity,leftMargin,rightMargin" duration: 200 } ColorAnimation { |