diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 05:19:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 05:19:51 (GMT) |
| commit | 223c791f6700b5141fa4932321f17a9937e353d8 (patch) | |
| tree | 9071564f98179e668f953825d52689cd0a7da00a /examples/declarative/snow | |
| parent | 1af063d9aaff5d0e5e8715202baeced55bbbb0bc (diff) | |
| parent | fb6498857241eb053cbf664d6f83928cab41cc8a (diff) | |
| download | Qt-223c791f6700b5141fa4932321f17a9937e353d8.zip Qt-223c791f6700b5141fa4932321f17a9937e353d8.tar.gz Qt-223c791f6700b5141fa4932321f17a9937e353d8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfximage.cpp
Diffstat (limited to 'examples/declarative/snow')
| -rw-r--r-- | examples/declarative/snow/ImageBatch.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/snow/snow.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml index bac4328..8aa4bb2 100644 --- a/examples/declarative/snow/ImageBatch.qml +++ b/examples/declarative/snow/ImageBatch.qml @@ -43,7 +43,7 @@ GridView { Image { id: Image; source: url; fillMode: "PreserveAspect"; smooth: true; anchors.fill: parent; opacity: (status == 0)?1:0; opacity: Behavior { NumberAnimation { properties: "opacity" } } } - Loading { anchors.centeredIn: parent; visible: Image.status } + Loading { anchors.centerIn: parent; visible: Image.status } states: State { name: "selected" diff --git a/examples/declarative/snow/snow.qml b/examples/declarative/snow/snow.qml index aa5185f..aed426f 100644 --- a/examples/declarative/snow/snow.qml +++ b/examples/declarative/snow/snow.qml @@ -21,7 +21,7 @@ Rect { property int selectedY: selectedItemRow * imageHeight Item { - anchors.centeredIn: parent + anchors.centerIn: parent HorizontalLayout { id: MyLayout property real targetX: -(selectedX + imageWidth / 2) |