diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 01:01:02 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-02 01:01:03 +0200 |
commit | a6a8832078caec920e02d68c2ce84b5587f6f0c0 (patch) | |
tree | 688a0799e231815895129a1570134c3e216d04f4 /src/qml/doc | |
parent | d9aad59d4144f5bf725893b5a008fe5c52ff5634 (diff) | |
parent | 14109aaccc37df53a0c4b591dddd68b41ec20ec3 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I1dd04210f10895c509b5c637fc5e2dcf66e3bb91
Diffstat (limited to 'src/qml/doc')
-rw-r--r-- | src/qml/doc/src/javascript/number.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/javascript/number.qdoc b/src/qml/doc/src/javascript/number.qdoc index b6f80f474a..288232255c 100644 --- a/src/qml/doc/src/javascript/number.qdoc +++ b/src/qml/doc/src/javascript/number.qdoc @@ -96,7 +96,7 @@ \code var german = Qt.locale("de_DE"); var d; - d = Number.fromLocaleString(german, "1234,56) // d == 1234.56 + d = Number.fromLocaleString(german, "1234,56") // d == 1234.56 d = Number.fromLocaleString(german, "1.234,56") // d == 1234.56 d = Number.fromLocaleString(german, "1234.56") // throws exception d = Number.fromLocaleString(german, "1.234") // d == 1234.0 |