diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 15:50:28 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 15:50:28 +0200 |
| commit | 715d0b474b23bc230319c33eb7316af23b5fccaa (patch) | |
| tree | ffd714454ce559433551632ffaaee1a21d8fd0a3 /src/quick/items | |
| parent | 607f2db351edf4b0f677c302fa37733596abe024 (diff) | |
| parent | 52eb21be3dd3a76d018b5b86a8d72d68accb924a (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
tests/auto/qml/qml.pro
Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquicktextinput.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index c195994de4..0cbb6e83a9 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -931,7 +931,7 @@ QQuickIntValidator::QQuickIntValidator(QObject *parent) This property holds the name of the locale used to interpret the number. - \sa QML:Qt::locale() + \sa {QtQml2::Qt::locale()}{Qt.locale()} */ QString QQuickIntValidator::localeName() const @@ -1006,7 +1006,7 @@ QQuickDoubleValidator::QQuickDoubleValidator(QObject *parent) This property holds the name of the locale used to interpret the number. - \sa QML:Qt::locale() + \sa {QtQml2::Qt::locale()}{Qt.locale()} */ QString QQuickDoubleValidator::localeName() const |