summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextinput.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-26 13:08:12 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-26 13:08:17 +0100
commit2ce3ad556d3e0d0af585fc3e6c62e1802c26a3b8 (patch)
tree6bb24a5f67292612e2f09e9fc7875f8a715930ca /src/declarative/graphicsitems/qdeclarativetextinput.cpp
parenta0783470449a911fce09d6328abfcff17973d421 (diff)
parent2bc722aedd28f004fe9a4400b24103bb7cc9716f (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 05b47d40..24a91f73 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 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, {declarative/text/textselection}{Text Selection example}