diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-04-30 11:33:39 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-04-30 11:33:39 (GMT) |
| commit | 9442115ce46e87bb5a5939980cf900702dc4a87a (patch) | |
| tree | 26f02a55361bcde4f0b221037094ab095c5ce57b /src/declarative/fx/qfxkeyactions.h | |
| parent | e2f9eb037dfd26e02cad8a31a499a9c92a315d8b (diff) | |
| parent | 5b15e629641281dd87197b22bd4d0dc5dc7c89e1 (diff) | |
| download | Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.zip Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.tar.gz Qt-9442115ce46e87bb5a5939980cf900702dc4a87a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxkeyactions.h')
| -rw-r--r-- | src/declarative/fx/qfxkeyactions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxkeyactions.h b/src/declarative/fx/qfxkeyactions.h index b0d002d..7ad323a 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 keyReturn READ key_Return WRITE setKey_Return) + Q_PROPERTY(QString return 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) |