diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-02 03:27:55 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-02 03:27:55 (GMT) |
| commit | ac9e2612e99c0e36b7e6396819af6e97da33f99c (patch) | |
| tree | 62672aa2af00252f6a777a2f2e83a727e1f283a7 /demos/declarative/flickr | |
| parent | 3158d9d663423e55907709f484dc9aab911afdb1 (diff) | |
| parent | 305de45a8d184738dc07fb7e5c787b9dbb5b3c6b (diff) | |
| download | Qt-ac9e2612e99c0e36b7e6396819af6e97da33f99c.zip Qt-ac9e2612e99c0e36b7e6396819af6e97da33f99c.tar.gz Qt-ac9e2612e99c0e36b7e6396819af6e97da33f99c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos/declarative/flickr')
| -rw-r--r-- | demos/declarative/flickr/content/ImageDetails.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/flickr/content/MediaButton.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/flickr/content/Star.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index c57f083..f53a43b 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -29,7 +29,7 @@ Flipable { MediaButton { id: BackButton; x: 630; y: 370; text: "Back" - onClicked: { Container.closed.emit() } + onClicked: { Container.closed() } } MediaButton { diff --git a/demos/declarative/flickr/content/MediaButton.qml b/demos/declarative/flickr/content/MediaButton.qml index 6392a13..49922f0 100644 --- a/demos/declarative/flickr/content/MediaButton.qml +++ b/demos/declarative/flickr/content/MediaButton.qml @@ -17,7 +17,7 @@ Item { MouseRegion { id: MouseRegion anchors.fill: Image - onClicked: { Container.clicked.emit(); } + onClicked: { Container.clicked(); } } Text { font.bold: true diff --git a/demos/declarative/flickr/content/Star.qml b/demos/declarative/flickr/content/Star.qml index 437450d..2c2807a 100644 --- a/demos/declarative/flickr/content/Star.qml +++ b/demos/declarative/flickr/content/Star.qml @@ -18,7 +18,7 @@ Item { } MouseRegion { anchors.fill: Container - onClicked: { Container.clicked.emit() } + onClicked: { Container.clicked() } } states: [ State { |