diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 22:37:26 (GMT) |
---|---|---|
committer | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 22:37:26 (GMT) |
commit | f238f6b05d444dc71022e91f40e0ade6094c5800 (patch) | |
tree | bdde436b157db6a3dd4c424c619f9a4306db96f4 /doc/src/snippets | |
parent | 423e373ed0935ebe3d2f54a4c56101081c3311b5 (diff) | |
parent | 6536b6f16ff26579f191543e5d468a6382211a29 (diff) | |
download | Qt-f238f6b05d444dc71022e91f40e0ade6094c5800.zip Qt-f238f6b05d444dc71022e91f40e0ade6094c5800.tar.gz Qt-f238f6b05d444dc71022e91f40e0ade6094c5800.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 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 } } } |