diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-10-26 03:55:40 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-10-26 03:55:40 (GMT) |
| commit | acf19f045ef7d6587c1f21f3270b62c16490cd27 (patch) | |
| tree | 2d66535100be52c25fd003cf0910632e2d06a67c /doc/src | |
| parent | afbbd1a5d23ab649c37e19225011831a9dbec486 (diff) | |
| parent | 60b8fc37ac04b9247481e5f03d1d7fa9ae059a07 (diff) | |
| download | Qt-acf19f045ef7d6587c1f21f3270b62c16490cd27.zip Qt-acf19f045ef7d6587c1f21f3270b62c16490cd27.tar.gz Qt-acf19f045ef7d6587c1f21f3270b62c16490cd27.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/pics/3d-rotation-axis.png | bin | 14304 -> 11078 bytes | |||
| -rw-r--r-- | doc/src/declarative/pics/axisrotation.png | bin | 3425 -> 8891 bytes | |||
| -rw-r--r-- | doc/src/snippets/declarative/rotation.qml | 16 |
3 files changed, 10 insertions, 6 deletions
diff --git a/doc/src/declarative/pics/3d-rotation-axis.png b/doc/src/declarative/pics/3d-rotation-axis.png Binary files differindex 1b17261..b940215 100644 --- a/doc/src/declarative/pics/3d-rotation-axis.png +++ b/doc/src/declarative/pics/3d-rotation-axis.png diff --git a/doc/src/declarative/pics/axisrotation.png b/doc/src/declarative/pics/axisrotation.png Binary files differindex 409a9e9..4cddcdf 100644 --- a/doc/src/declarative/pics/axisrotation.png +++ b/doc/src/declarative/pics/axisrotation.png diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/declarative/rotation.qml index aaaebee..4a67dcb 100644 --- a/doc/src/snippets/declarative/rotation.qml +++ b/doc/src/snippets/declarative/rotation.qml @@ -4,25 +4,29 @@ Rectangle { width: 360; height: 80 color: "white" //! [0] - HorizontalLayout { - margin: 10 + Row { + x: 10; y: 10 spacing: 10 Image { source: "pics/qt.png" } Image { source: "pics/qt.png" - transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0 angle: 18 } + transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 18 } + smooth: true } Image { source: "pics/qt.png" - transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0 angle: 36 } + transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 36 } + smooth: true } Image { source: "pics/qt.png" - transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0; angle: 54 } + transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 54 } + smooth: true } Image { source: "pics/qt.png" - transform: Rotation { origin.x: 30; axis.y: 60; axis.z: 0; angle: 72 } + transform: Rotation { origin.x: 30; origin.y: 30; axis { x: 0; y: 1; z: 0 } angle: 72 } + smooth: true } } //! [0] |
