diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-19 21:22:10 +0200 |
| commit | 79349119c66c2237d70fe4c13ebb9fe273ce2f85 (patch) | |
| tree | 4cfa3561f188a3904496cef330c79c1a687436ed /src/quick/items/qquicktextinput.cpp | |
| parent | bf3b596066af733c04b5ed3ef2dc9ec753a41e79 (diff) | |
| parent | 4f0988c3907406087dbfdc193abfbf767678d814 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
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 17f00ebef9..fd158207c6 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -84,7 +84,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) and setting \l echoMode to an appropriate value enables TextInput to be used for a password input field. - On OS X, the Up/Down key bindings for Home/End are explicitly disabled. + On \macos, the Up/Down key bindings for Home/End are explicitly disabled. If you want such bindings (on any platform), you will need to construct them in QML. \sa TextEdit, Text |