diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-12 01:52:14 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-12 01:52:14 (GMT) |
| commit | 7a3557acf5e0a9570e7e7e033a096eef5ca87055 (patch) | |
| tree | 2cb3cece0e184c6e4681bc56d34f9bde815e6a89 /demos | |
| parent | 4ea4c6d103034cbe063004ba7a533cf4e56b1922 (diff) | |
| parent | 1eac1941b8ad8131fea9da68a342fe3bf7b0ece2 (diff) | |
| download | Qt-7a3557acf5e0a9570e7e7e033a096eef5ca87055.zip Qt-7a3557acf5e0a9570e7e7e033a096eef5ca87055.tar.gz Qt-7a3557acf5e0a9570e7e7e033a096eef5ca87055.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.qml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index b33b00f..829f568 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -205,25 +205,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 - } } |