diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-21 06:03:18 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-21 06:03:18 (GMT) |
| commit | 62d1aea8cf3f2bc9f1753ac1d4147bebfba90cb5 (patch) | |
| tree | fd6f1fc03c73cee1f5de186850040dda773acca9 /src/declarative/QmlChanges.txt | |
| parent | 7636fe8d8dee269c71189eca93700667f5dd8a96 (diff) | |
| parent | 8598114e3379df3a73d4ccc7760e3761ed55edf0 (diff) | |
| download | Qt-62d1aea8cf3f2bc9f1753ac1d4147bebfba90cb5.zip Qt-62d1aea8cf3f2bc9f1753ac1d4147bebfba90cb5.tar.gz Qt-62d1aea8cf3f2bc9f1753ac1d4147bebfba90cb5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/QmlChanges.txt')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 7fba47a..5abf370 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -18,6 +18,13 @@ Rect -> Rectangle FocusRealm -> FocusScope FontFamily -> FontLoader Palette -> SystemPalette +Bind -> Binding +SetProperties -> PropertyChanges +RunScript -> StateChangeScript +SetAnchors -> AnchorChanges +SetPropertyAction -> PropertyAction +RunScriptAction -> ScriptAction +ParentChangeAction -> ParentAction Renamed properties: MouseRegion: xmin -> minimumX @@ -33,6 +40,7 @@ Follow: followValue -> value Additions: MouseRegion: add "acceptedButtons" property MouseRegion: add "hoverEnabled" property +MouseRegion: add "pressedButtons" property Timer: add start() and stop() slots Deletions: @@ -49,12 +57,6 @@ Pending Changes =============== Renamed elements: -RunScriptAction -> ScriptAction -ParentChangeAction -> ParentAction -Bind -> Binding -SetProperties -> PropertyChanges -RunScript -> StateChangeScript -SetAnchors -> AnchorChanges Renamed properties: Transition: fromState -> from @@ -65,5 +67,4 @@ PropertyAction::property PropertyAction::target (if possible) Additions: -MouseRegion: add "pressedButtons" property Connection: add "slot" property |