diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-08 05:30:38 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-08 05:30:38 (GMT) |
| commit | cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709 (patch) | |
| tree | 37a16ff73fe102ac0cd169b20f9b12135903d33a /src/declarative/QmlChanges.txt | |
| parent | 5305831c3b0d58a61efadc1c1d3ce9ce4d6e8c77 (diff) | |
| parent | b9a924a1e77faeeba595d0619afb14e8fdbb2dd4 (diff) | |
| download | Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.zip Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.tar.gz Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index 95c81c7..9bf4b10 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -66,6 +66,7 @@ MouseRegion: add "hoverEnabled" property MouseRegion: add "pressedButtons" property Timer: add start() and stop() slots WebView: add newWindowComponent and newWindowParent properties +Loader: add status() and progress() properties Deletions: Column/VerticalPositioner: lost "margins" property |