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/contacts | |
| 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/contacts')
| -rw-r--r-- | demos/declarative/contacts/Button.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/contacts/FieldText.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/contacts/RemoveButton.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml index 09af769..629dce8 100644 --- a/demos/declarative/contacts/Button.qml +++ b/demos/declarative/contacts/Button.qml @@ -18,7 +18,7 @@ Item { MouseRegion { id: buttonMouseRegion anchors.fill: buttonRect - onClicked: { button.clicked.emit() } + onClicked: { button.clicked() } } states: [ State { diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml index 561e3c3..c8bf932 100644 --- a/demos/declarative/contacts/FieldText.qml +++ b/demos/declarative/contacts/FieldText.qml @@ -20,7 +20,7 @@ Rect { fieldText.text = textEdit.text; fieldText.state=''; contacts.mouseGrabbed=false; - fieldText.confirmed.emit(); + fieldText.confirmed(); } function reset() { textEdit.text = fieldText.text; diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml index 549c97a..00bce34 100644 --- a/demos/declarative/contacts/RemoveButton.qml +++ b/demos/declarative/contacts/RemoveButton.qml @@ -60,7 +60,7 @@ Rect { opacity: 0 MouseRegion { anchors.fill: parent - onClicked: { toggle(); removeButton.confirmed.emit() } + onClicked: { toggle(); removeButton.confirmed() } } } Text { |