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/ComboBox.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/ComboBox.qml')
| -rw-r--r-- | src/controls/ComboBox.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 21d473d6..f3cde537 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -195,8 +195,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 field: |