diff options
| author | J-P Nurmi <jpnurmi@gmail.com> | 2014-09-04 15:08:18 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@digia.com> | 2014-09-05 08:55:00 +0200 |
| commit | fd73185bd9cc046410cb8253bc9146a44fd83224 (patch) | |
| tree | 6cc5c95608690984712de17d8257633ca8d81ad3 | |
| parent | b7f07e6d289a4235d4dc6000730226fb04045988 (diff) | |
| download | qtquickcontrols-fd73185bd9cc046410cb8253bc9146a44fd83224.tar.gz | |
Revert "TextField/Area: soft dependency to inputMethodHints"
This broke the input method hints handling altogether. We will
fix this properly in QtQuickTextInput and QQuickTextEdit instead.
Nobody has even complained about QT_NO_IM, it was a hypothetical
problem brought up in code reviews.
This reverts commit c185d6cd67653b34f04a7999a84634de1f1063b0.
Change-Id: Ib81adba1ee899dd2a384bd83eea82d629eacb333
Reviewed-by: Samuel Nevala <samuel.nevala@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| -rw-r--r-- | src/controls/TextArea.qml | 2 | ||||
| -rw-r--r-- | src/controls/TextField.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 83d42aaf..74ed716e 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -235,7 +235,7 @@ ScrollView { \li Qt.ImhExclusiveInputMask - This mask yields nonzero if any of the exclusive flags are used. \endlist */ - property int inputMethodHints: edit.inputMethodHints || Qt.ImhNone + property alias inputMethodHints: edit.inputMethodHints /*! \qmlproperty int TextArea::length diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index 89e23ed2..58498f13 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -281,7 +281,7 @@ Control { \li Qt.ImhExclusiveInputMask - This mask yields nonzero if any of the exclusive flags are used. \endlist */ - property int inputMethodHints: textInput.inputMethodHints || Qt.ImhNone + property alias inputMethodHints: textInput.inputMethodHints /*! \qmlproperty int TextField::length |