diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-09 18:40:02 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-09 18:40:02 +0200 |
commit | 223ec0f7827fde5609d7d48237a95e9b7c9563e1 (patch) | |
tree | af8420daede7cd8208adda1c8cb6381b062bdc83 /src/controls/TextField.qml | |
parent | a25023d56f16d8d3c08cc60f7059cf10a3b8a5ba (diff) | |
parent | f2a3019e4332b756b5b27092768bf4039dca7c7a (diff) | |
download | qtquickcontrols-223ec0f7827fde5609d7d48237a95e9b7c9563e1.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/controls/ToolBar.qml
Change-Id: I5510496219a4ebe8bfced4192307219238ca9bb6
Diffstat (limited to 'src/controls/TextField.qml')
-rw-r--r-- | src/controls/TextField.qml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index dfadd78d..f74c6ed0 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -49,11 +49,19 @@ import QtQuick.Controls.Private 1.0 \ingroup controls \brief Displays a single line of editable plain text. + \image textfield.png + TextField is used to accept a line of text input. Input constraints can be placed on a TextField item (for example, through a \l validator or \l inputMask). Setting \l echoMode to an appropriate value enables TextField to be used for a password input field. + \qml + TextField { + placeholderText: qsTr("Enter name") + } + \endqml + You can create a custom appearance for a TextField by assigning a \l {QtQuick.Controls.Styles::TextFieldStyle}{TextFieldStyle}. @@ -293,7 +301,7 @@ Control { \li Qt.ImhExclusiveInputMask - This mask yields nonzero if any of the exclusive flags are used. \endlist */ - property alias inputMethodHints: textInput.inputMethodHints + property int inputMethodHints: textInput.inputMethodHints || Qt.ImhNone /*! \qmlproperty int TextField::length |