aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmllocale.cpp
diff options
context:
space:
mode:
authorAnders Gunnarsson <anders.gunnarsson@appello.com>2013-11-12 14:58:44 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-07 13:43:24 +0100
commit5f6436e474624997b284547e4ee117fb49d29e79 (patch)
treec08ad29ed89ea5e4d3513c6dfdaceea8ae5e106c /src/qml/qml/qqmllocale.cpp
parenta8a90519cb35481e96fe8889846bfaa424e13e8a (diff)
Updated documentation for QML Locale.measurementSystem
Added documentation for ImperialUSSystem and ImperialUKSystem. Change-Id: I1a628121dce4a7566bd8769843c487e28f3dd6fe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
-rw-r--r--src/qml/qml/qqmllocale.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 36e0da5b60..14b5471317 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -1118,9 +1118,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
*/