diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-05-05 11:29:03 +1000 |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2011-05-05 11:29:03 +1000 |
| commit | 5f46c8e70f8891cb8702bf4c5949d3595b193660 (patch) | |
| tree | 92106b292ace88089bf784ad55ee3d833a6c3ffb /src/declarative/items/qsgtextinput_p.h | |
| parent | 3ea78d14ec04e7d39dd8848eef5ba4daf527d841 (diff) | |
| parent | cff3c25ee616a7aee7bf1c0f983a190415668f5f (diff) | |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Diffstat (limited to 'src/declarative/items/qsgtextinput_p.h')
| -rw-r--r-- | src/declarative/items/qsgtextinput_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/items/qsgtextinput_p.h b/src/declarative/items/qsgtextinput_p.h index ee04579a54..ccea485e99 100644 --- a/src/declarative/items/qsgtextinput_p.h +++ b/src/declarative/items/qsgtextinput_p.h @@ -1,4 +1,4 @@ -// Commit: 27e4302b7f45f22180693d26747f419177c81e27 +// Commit: 2f173e4945dd8414636c1061acfaf9c2d8b718d8 /**************************************************************************** ** ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). @@ -83,7 +83,7 @@ class Q_AUTOTEST_EXPORT QSGTextInput : public QSGImplicitSizePaintedItem Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged) #endif Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged) - Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints) + Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ imHints WRITE setIMHints) Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged) Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged) @@ -212,6 +212,9 @@ public: bool isInputMethodComposing() const; + Qt::InputMethodHints imHints() const; + void setIMHints(Qt::InputMethodHints hints); + Q_SIGNALS: void textChanged(); void cursorPositionChanged(); |