diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
| commit | 2ff13bdf697adff8574c5cea716627c78fb6b5b3 (patch) | |
| tree | f4eac21b3b54f62d9f79714f40d5c9f4804dfc0c /src/quick/items/qquicktextinput.cpp | |
| parent | 9d487cd6bf8ad75de19a4c05eb3d2641ce4a5289 (diff) | |
| parent | e13eece273195a9f39d29712a233a8dd00ddf71b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I171c7dbb6a74fe743c2eec63e86e9c0bef7c7dfd
Diffstat (limited to 'src/quick/items/qquicktextinput.cpp')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index 4c9a1f8dfc..9a43ee8bdf 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -766,7 +766,7 @@ void QQuickTextInput::setMaxLength(int ml) (but without actually giving it active focus). It should not be set directly on the item, like in the below QML, - as the specified value will be overridden an lost on focus changes. + as the specified value will be overridden and lost on focus changes. \code TextInput { |