summaryrefslogtreecommitdiffstats
path: root/examples/declarative/webview
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 /examples/declarative/webview
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 'examples/declarative/webview')
-rw-r--r--examples/declarative/webview/autosize.qml2
-rw-r--r--examples/declarative/webview/content/FieldText.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/webview/autosize.qml b/examples/declarative/webview/autosize.qml
index 1614906..74c6844 100644
--- a/examples/declarative/webview/autosize.qml
+++ b/examples/declarative/webview/autosize.qml
@@ -1,7 +1,7 @@
import Qt 4.6
// The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight matchProperties.
+// preferredWidth, and preferredHeight properties.
Rectangle {
id: rect
color: "white"
diff --git a/examples/declarative/webview/content/FieldText.qml b/examples/declarative/webview/content/FieldText.qml
index 6b1d271..b1c1938 100644
--- a/examples/declarative/webview/content/FieldText.qml
+++ b/examples/declarative/webview/content/FieldText.qml
@@ -149,7 +149,7 @@ Item {
to: "*"
reversible: true
NumberAnimation {
- matchProperties: "opacity,leftMargin,rightMargin"
+ properties: "opacity,leftMargin,rightMargin"
duration: 200
}
ColorAnimation {