diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-09-16 12:35:28 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-09-16 12:38:06 +0200 |
| commit | 1aecda36d1d12bcd24a5ee87dd82ed04f85c41e2 (patch) | |
| tree | af84a7911c2d6a2c1d54582810cb95665ae534f1 /src/controls/TextArea.qml | |
| parent | 6a7a824b970d12471f9219c84a57eb91231c59fe (diff) | |
| parent | d70e5ebe11a8eb22fe5e71945982d81991dc9f09 (diff) | |
Merge remote-tracking branch 'origin/5.3.2' into 5.3
Change-Id: I91d1886e6081e39a1b5ea17b6c44d73b539889b1
Diffstat (limited to 'src/controls/TextArea.qml')
| -rw-r--r-- | src/controls/TextArea.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 83d42aaf5..74ed716e2 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 |