diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-06-14 23:42:34 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-06-14 23:42:34 (GMT) |
| commit | d05892248dfc4f06e27d61aa4d485d1dd983992f (patch) | |
| tree | 31ee35af808d897fca5e76304b8d0f483a198ff9 /examples/declarative | |
| parent | 31b30cf6e95cf76d62d226b3253cc9ed2076b1a1 (diff) | |
| parent | d758080a6c345abec5e06a36ed26a2757a53c65f (diff) | |
| download | Qt-d05892248dfc4f06e27d61aa4d485d1dd983992f.zip Qt-d05892248dfc4f06e27d61aa4d485d1dd983992f.tar.gz Qt-d05892248dfc4f06e27d61aa4d485d1dd983992f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/behaviours/test.qml | 15 | ||||
| -rw-r--r-- | examples/declarative/xmldata/daringfireball.qml | 1 | ||||
| -rw-r--r-- | examples/declarative/xmldata/yahoonews.qml | 1 |
3 files changed, 4 insertions, 13 deletions
diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml index bb7109e..e6a50cd 100644 --- a/examples/declarative/behaviours/test.qml +++ b/examples/declarative/behaviours/test.qml @@ -54,7 +54,7 @@ Rect { width: 100 height: 100 id: bluerect - x: Behaviour { + x: Behavior { SequentialAnimation { NumericAnimation { target: bluerect @@ -73,13 +73,9 @@ Rect { duration: 250 } } - NumericAnimation { - target: bluerect - property: "x" - duration: 500 - } + NumericAnimation { duration: 500 } } - parent: Behaviour { + parent: Behavior { SequentialAnimation { NumericAnimation { target: bluerect @@ -87,10 +83,7 @@ Rect { to: 0 duration: 150 } - SetPropertyAction { - target: bluerect - property: "parent" - } + SetPropertyAction {} NumericAnimation { target: bluerect properties: "opacity" diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml index 3877adf..b14dfbf 100644 --- a/examples/declarative/xmldata/daringfireball.qml +++ b/examples/declarative/xmldata/daringfireball.qml @@ -19,7 +19,6 @@ Rect { Role { name: "content" query: "content/string()" - isCData: true } }, Component { diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml index 206c85f..b465ef1 100644 --- a/examples/declarative/xmldata/yahoonews.qml +++ b/examples/declarative/xmldata/yahoonews.qml @@ -21,7 +21,6 @@ Rect { Role { name: "description" query: "description/string()" - isCData: true } }, Component { |