diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-02-12 04:12:04 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-02-12 04:12:04 (GMT) |
| commit | 697f8f9921701a5da3ef8a97c97f33ade1db8ecf (patch) | |
| tree | 8ae25c8391b9422dfacd6cb10f1339e8f4e02556 /src | |
| parent | 3aa16c105b7f9e55e804ee6bbb738dd267e484f2 (diff) | |
| download | Qt-697f8f9921701a5da3ef8a97c97f33ade1db8ecf.zip Qt-697f8f9921701a5da3ef8a97c97f33ade1db8ecf.tar.gz Qt-697f8f9921701a5da3ef8a97c97f33ade1db8ecf.tar.bz2 | |
Adds inputMethodHint property to TextEdit and TextInput.
Reviewed-by: Martin Jones
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextedit_p.h | 1 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicstextinput_p.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h index 97c3fae..e95b077 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextedit_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextedit_p.h @@ -84,6 +84,7 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsTextEdit : public QmlGraphicsPaintedItem Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY focusOnPressChanged) Q_PROPERTY(bool persistentSelection READ persistentSelection WRITE setPersistentSelection NOTIFY persistentSelectionChanged) Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin NOTIFY textMarginChanged) + Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints) public: QmlGraphicsTextEdit(QmlGraphicsItem *parent=0); diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h index 68f28f8..4708381 100644 --- a/src/declarative/graphicsitems/qmlgraphicstextinput_p.h +++ b/src/declarative/graphicsitems/qmlgraphicstextinput_p.h @@ -81,6 +81,8 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsTextInput : public QmlGraphicsPaintedItem Q_PROPERTY(int maximumLength READ maxLength WRITE setMaxLength NOTIFY maximumLengthChanged) Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged) Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged) + Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints) + Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged) Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged) Q_PROPERTY(bool focusOnPress READ focusOnPress WRITE setFocusOnPress NOTIFY focusOnPressChanged) |