diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:05:35 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:08:28 +0100 |
| commit | bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c (patch) | |
| tree | f6267744ec62ad67a80607dd51fb6cf45632bdda /src/declarative/graphicsitems | |
| parent | e960ecdeb9a2dec5917ffba6bf607f124713ae53 (diff) | |
| parent | dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 3ff75fd7..263197b6 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE and setting \l echoMode to an appropriate value enables TextInput to be used for a password input field. - On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled. + On OS X, 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, {declarative/text/textselection}{Text Selection example} |