diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-17 11:37:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 11:37:03 +0100 |
| commit | 9ef983d05df921d47cc0827670a8e3481bcc84ef (patch) | |
| tree | 0e38f79c465401c197554ba325101711a3e6c670 /src/controls/TextField.qml | |
| parent | 04ab2428e004f01f630eb5117255bb85f5390fb4 (diff) | |
| parent | a20948b726c1e0edd70761e8e115a53ba5526a51 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/controls/TextField.qml')
| -rw-r--r-- | src/controls/TextField.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index d74ed0ac0..b173c95db 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -375,8 +375,8 @@ Control { an intermediate state. The accepted signal will only be sent if the text is in an acceptable state when enter is pressed. - Currently supported validators are \l{QtQuick2::IntValidator}, - \l{QtQuick2::DoubleValidator}, and \l{QtQuick2::RegExpValidator}. An + Currently supported validators are \l{QtQuick::}{IntValidator}, + \l{QtQuick::}{DoubleValidator}, and \l{QtQuick::}{RegExpValidator}. An example of using validators is shown below, which allows input of integers between 11 and 31 into the text input: @@ -582,7 +582,7 @@ Control { TextInput { id: textInput focus: true - selectByMouse: true + selectByMouse: Qt.platform.os !== "android" // Workaround for QTBUG-36515 selectionColor: __panel ? __panel.selectionColor : "darkred" selectedTextColor: __panel ? __panel.selectedTextColor : "white" |