diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-14 02:32:21 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-07-14 02:32:21 (GMT) |
commit | 32c2412d55d2387e8b05892fe1b1d2d54b624d02 (patch) | |
tree | 07156d15d54125620799e2866cc259c564ac79ea /doc/src/snippets | |
parent | a675b9ef9f85fa4a2fa245cd164d1e330b703bd9 (diff) | |
parent | 07ebc9161263c04dc072b9fc2a922b9665cbe7be (diff) | |
download | Qt-32c2412d55d2387e8b05892fe1b1d2d54b624d02.zip Qt-32c2412d55d2387e8b05892fe1b1d2d54b624d02.tar.gz Qt-32c2412d55d2387e8b05892fe1b1d2d54b624d02.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src/snippets')
-rw-r--r-- | doc/src/snippets/declarative/mousearea.qml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/src/snippets/declarative/mousearea.qml b/doc/src/snippets/declarative/mousearea.qml index 8e7c737..fb6cba0 100644 --- a/doc/src/snippets/declarative/mousearea.qml +++ b/doc/src/snippets/declarative/mousearea.qml @@ -83,17 +83,18 @@ Rectangle { id: container width: 600; height: 200 - Image { - id: pic - source: "pics/qt.png" - opacity: (600.0 - pic.x) / 600 + Rectangle { + id: rect + width: 50; height: 50 + color: "red" + opacity: (600.0 - rect.x) / 600 MouseArea { anchors.fill: parent - drag.target: pic + drag.target: rect drag.axis: Drag.XAxis drag.minimumX: 0 - drag.maximumX: container.width - pic.width + drag.maximumX: container.width - rect.width } } } |