diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-30 04:54:49 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-30 04:54:49 (GMT) |
| commit | f2fb6b63c6e5572d02245c64da652f13174588b9 (patch) | |
| tree | b12510b317cf9f01ecf01f9d4f082864207fc1b8 /src | |
| parent | 0204346fb91eaf73893b651438980cb9ca5f1f51 (diff) | |
| download | Qt-f2fb6b63c6e5572d02245c64da652f13174588b9.zip Qt-f2fb6b63c6e5572d02245c64da652f13174588b9.tar.gz Qt-f2fb6b63c6e5572d02245c64da652f13174588b9.tar.bz2 | |
Convert all examples and demos from XML format
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/fx/qfxkeyactions.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/fx/qfxkeyactions.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxkeyactions.cpp b/src/declarative/fx/qfxkeyactions.cpp index 69d4679..d2739ea 100644 --- a/src/declarative/fx/qfxkeyactions.cpp +++ b/src/declarative/fx/qfxkeyactions.cpp @@ -736,7 +736,7 @@ void QFxKeyActions::setKey_Space(const QString &s) /*! \qmlproperty string KeyActions::escape - \qmlproperty string KeyActions::return + \qmlproperty string KeyActions::keyReturn \qmlproperty string KeyActions::enter \qmlproperty string KeyActions::delete \qmlproperty string KeyActions::space diff --git a/src/declarative/fx/qfxkeyactions.h b/src/declarative/fx/qfxkeyactions.h index 7ad323a..b0d002d 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) |