diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-11 11:08:11 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-02-11 12:00:31 +0100 |
| commit | 7c9497a6d47a02d961baef3993ba4cf4267ec607 (patch) | |
| tree | 335fae3e9e3a84d33310efca23f1d6993265805b /src/qml/qml/qqmllocale.cpp | |
| parent | 67ba88947f57ab2d1859bbeb96c6dcba020561b1 (diff) | |
| parent | 6c840c70d61c3ae277b60a024a086215c743e5b3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arrayobject.cpp
src/qml/jsruntime/qv4context.cpp
Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
| -rw-r--r-- | src/qml/qml/qqmllocale.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index 0ea9785673..fc9e2fc42a 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -1066,9 +1066,12 @@ QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::CallContext *ctx) \list \li Locale.MetricSystem This value indicates metric units, such as meters, centimeters and millimeters. - \li Locale.ImperialSystem This value indicates imperial units, such as inches and - miles. There are several distinct imperial systems in the world; this - value stands for the official United States imperial units. + \li Locale.ImperialUSSystem This value indicates imperial units, such as + inches and miles as they are used in the United States. + \li Locale.ImperialUKSystem This value indicates imperial units, such as + inches and miles as they are used in the United Kingdom. + \li Locale.ImperialSystem Provided for compatibility. The same as + Locale.ImperialUSSystem. \endlist */ |