diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-04 19:32:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-04 19:32:50 +0100 |
| commit | dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 (patch) | |
| tree | d2609e5bd0f67e9c4b0a2e3a362defcf7549a6ba /src/declarative/graphicsitems/qdeclarativetextinput.cpp | |
| parent | ef57010bec52f0d39840e629b2b47f6f56fc337b (diff) | |
| parent | f079636a3ee5538eb79fd4e7e6ffcb0465a015a0 (diff) | |
| download | qtquick1-dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6.05.6.0
Conflicts:
.qmake.conf
Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput.cpp')
| -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} |