summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-04-05 12:27:41 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-04-05 12:27:41 +0000
commite6e42c42d374c7a18a3affae822462931eaa0a71 (patch)
treeab8ff395910333edff3c80df993354f25e675696 /src/declarative/graphicsitems
parent695460401d9a89d2f156016d51601b2e59b64105 (diff)
parent2ce3ad556d3e0d0af585fc3e6c62e1802c26a3b8 (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/declarative/graphicsitems')
-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}