summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-12 02:05:06 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-12 02:05:06 (GMT)
commitbfccf0ab1190031de3e2bc5c47df3520fb15e90c (patch)
tree65297abcbdb4d452289e03ee71c6d7a3af15585e /demos
parent976d10fe607306fb2cc7c12da7503b0b3986f0d1 (diff)
parent7a3557acf5e0a9570e7e7e033a096eef5ca87055 (diff)
downloadQt-bfccf0ab1190031de3e2bc5c47df3520fb15e90c.zip
Qt-bfccf0ab1190031de3e2bc5c47df3520fb15e90c.tar.gz
Qt-bfccf0ab1190031de3e2bc5c47df3520fb15e90c.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
-rw-r--r--demos/declarative/flickr/flickr.qml21
1 files changed, 0 insertions, 21 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index f38765b..8d294f8 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -203,25 +203,4 @@ Item {
(FeedModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + FeedModel.tags)
font.size: 16; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
}
-
- Image {
- source: "content/pics/fingerpoint.png"
- opacity: finger.pressed ? 0 : 1
- x: finger.mouseX-16
- y: finger.mouseY-16
- }
-
- Image {
- source: "content/pics/fingerpoint-pressed.png"
- opacity: finger.pressed ? 1.0 : 0.0
- x: finger.mouseX-16
- y: finger.mouseY-16
- }
-
- MouseRegion {
- // this region is just to show where the finger is (good for videos)
- id: finger
- absorb: false
- anchors.fill: parent
- }
}