diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 14:21:44 +0100 |
commit | a20948b726c1e0edd70761e8e115a53ba5526a51 (patch) | |
tree | cdcf3367f67c465f005a97dec6141e5a4e024781 /src/controls/TextField.qml | |
parent | 3434a0d5f8cb4bb5008caec3772c4e398986196f (diff) | |
parent | 1c54d411ad6e98c3779a412750aec8b93d587872 (diff) | |
download | qtquickcontrols-a20948b726c1e0edd70761e8e115a53ba5526a51.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/layouts/qquicklinearlayout.cpp
Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3
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 d74ed0ac..b173c95d 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" |