diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 16:19:29 +0200 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-27 19:22:48 +0200 |
| commit | d236fe2214340164bec4f34cb27dea4a634ee0de (patch) | |
| tree | cda4ebbcc91717b37e5a2dbccb9ee46c2a1d3885 /src/corelib/tools/qlocale.qdoc | |
| parent | 2b17b0235b70f89d15d3b91a14c3297d38377f94 (diff) | |
| parent | cbc883da6910b3357a4e03d0e2dfa841da1a03e8 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/global/qisenum.h
src/dbus/qdbusconnection_p.h
src/widgets/kernel/qwidget.cpp
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
Diffstat (limited to 'src/corelib/tools/qlocale.qdoc')
| -rw-r--r-- | src/corelib/tools/qlocale.qdoc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index ff994ca2f3..32822c2e6e 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -672,9 +672,11 @@ \value MetricSystem This value indicates metric units, such as meters, centimeters and millimeters. - \value 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. + \value ImperialUSSystem This value indicates imperial units, such as inches and + miles as they are used in the United States. + \value ImperialUKSystem This value indicates imperial units, such as inches and + miles as they are used in the United Kingdom. + \value ImperialSystem Provided for compatibility. Same as ImperialUSSystem \since 4.4 */ |