summaryrefslogtreecommitdiff
path: root/src/controls/TextField.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-09-16 12:35:28 +0200
committerJ-P Nurmi <jpnurmi@digia.com>2014-09-16 12:38:06 +0200
commit1aecda36d1d12bcd24a5ee87dd82ed04f85c41e2 (patch)
treeaf84a7911c2d6a2c1d54582810cb95665ae534f1 /src/controls/TextField.qml
parent6a7a824b970d12471f9219c84a57eb91231c59fe (diff)
parentd70e5ebe11a8eb22fe5e71945982d81991dc9f09 (diff)
downloadqtquickcontrols-1aecda36d1d12bcd24a5ee87dd82ed04f85c41e2.tar.gz
Merge remote-tracking branch 'origin/5.3.2' into 5.3
Change-Id: I91d1886e6081e39a1b5ea17b6c44d73b539889b1
Diffstat (limited to 'src/controls/TextField.qml')
-rw-r--r--src/controls/TextField.qml2
1 files changed, 1 insertions, 1 deletions
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