diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-02-15 11:22:14 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-02-15 11:22:23 +0100 |
| commit | f6fec74d4238e304643b99880bdfd8ee32c8578e (patch) | |
| tree | f3880de9e9890cb6b140ba5722d91819b800616f /src/quicktemplates2/qquickspinbox.cpp | |
| parent | 72d5d88afe64a76f2026e4a45a4858a13917d4f0 (diff) | |
| parent | d95e67c291d213cdbf41b23c535b47aa3a553ab5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id3333e9bb67ced4c6dbae5845512fe1927a7b858
Diffstat (limited to 'src/quicktemplates2/qquickspinbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 5e74f6ef..525de945 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -818,7 +818,7 @@ void QQuickSpinBox::setWrap(bool wrap) This property holds the textual value of the spinbox. - The value of the property is based on \l textFromValue() and \l {Control::} + The value of the property is based on \l textFromValue and \l {Control::} {locale}, and equal to: \badcode var text = spinBox.textFromValue(spinBox.value, spinBox.locale) |