diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-07-29 06:52:33 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-07-29 06:52:33 (GMT) |
| commit | 20d9edfa3b7a8a648cfdb59a0e71525912f0a0a8 (patch) | |
| tree | 151990f0e9861682e2d76501447ee63e96484cfd | |
| parent | da0b71b85dd3142d77a9e769327e55687ce9a7ae (diff) | |
| download | Qt-20d9edfa3b7a8a648cfdb59a0e71525912f0a0a8.zip Qt-20d9edfa3b7a8a648cfdb59a0e71525912f0a0a8.tar.gz Qt-20d9edfa3b7a8a648cfdb59a0e71525912f0a0a8.tar.bz2 | |
KeyActions::return -> KeyActions::keyReturn
| -rw-r--r-- | demos/declarative/flickr/content/MediaLineEdit.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/webbrowser/webbrowser.qml | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxkeyactions.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml index a02f92d..b8d30ce 100644 --- a/demos/declarative/flickr/content/MediaLineEdit.qml +++ b/demos/declarative/flickr/content/MediaLineEdit.qml @@ -104,6 +104,6 @@ Item { } KeyActions { id: ReturnKey - return: "Container.state = ''" + keyReturn: "Container.state = ''" } } diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml index d3a65db..28e5f16 100644 --- a/demos/declarative/webbrowser/webbrowser.qml +++ b/demos/declarative/webbrowser/webbrowser.qml @@ -126,7 +126,7 @@ Item { } KeyActions { id: keyActions - return: "WebBrowser.url = EditUrl.text; proxy.focus=false;" + keyReturn: "WebBrowser.url = EditUrl.text; proxy.focus=false;" } */ TextEdit { diff --git a/src/declarative/fx/qfxkeyactions.h b/src/declarative/fx/qfxkeyactions.h index 91c2806..d679d46 100644 --- a/src/declarative/fx/qfxkeyactions.h +++ b/src/declarative/fx/qfxkeyactions.h @@ -101,7 +101,7 @@ class Q_DECLARATIVE_EXPORT QFxKeyActions : public QFxItem Q_PROPERTY(QString digit9 READ key_9 WRITE setKey_9) Q_PROPERTY(QString asterisk READ key_Asterisk WRITE setKey_Asterisk) Q_PROPERTY(QString escape READ key_Escape WRITE setKey_Escape) - Q_PROPERTY(QString return READ key_Return WRITE setKey_Return) + Q_PROPERTY(QString keyReturn READ key_Return WRITE setKey_Return) Q_PROPERTY(QString enter READ key_Enter WRITE setKey_Enter) Q_PROPERTY(QString delete READ key_Delete WRITE setKey_Delete) Q_PROPERTY(QString space READ key_Space WRITE setKey_Space) |