diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-04-19 14:00:48 +1000 |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-04-21 15:22:56 +1000 |
| commit | 2f173e4945dd8414636c1061acfaf9c2d8b718d8 (patch) | |
| tree | f4e97364bea41b9459d9866a404481d48a66f3f2 /src/declarative/graphicsitems/qdeclarativetextinput_p.h | |
| parent | 6e5a642c9484536fc173714f560f739944368cf5 (diff) | |
| download | qt4-tools-2f173e4945dd8414636c1061acfaf9c2d8b718d8.tar.gz | |
Fix TextInput echoMode clearing inputMethodHints set by the user.
Changing to the Normal echo mode from another mode clears the
NoPredictiveText and NoAutoUppercase flags, irrespective of who
originally set them. Add separate accessors for the property value
so echo mode can overwrite the authoritive value without losing the
value set in QML.
Change-Id: I6a9563057bb17796b17ac7c2a3c564bb5e886c4d
Task-number: QTBUG-18735
Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h index 8c873b3329..ec70e43f68 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h @@ -86,7 +86,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextInput : public QDeclarativeImplicitSizeP 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) @@ -215,6 +215,9 @@ public: bool isInputMethodComposing() const; + Qt::InputMethodHints imHints() const; + void setIMHints(Qt::InputMethodHints hints); + Q_SIGNALS: void textChanged(); void cursorPositionChanged(); |