diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-22 10:53:45 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-26 11:41:07 +0200 |
| commit | 8660f6e385b2070db1b33dab85b5686a00fec06b (patch) | |
| tree | 6046c82010c5e29454cfe071be0ca80ec70e683a /src/corelib/tools/qlocale.h | |
| parent | bc0b37d6b61fc8ab83026d6a5e515666e58d7938 (diff) | |
Fix measurement system for the UK
THe UK still uses the Imperial system at least for distances
and many other things.
Change-Id: I99379de35620114328ad6a7fc9b226a46692bedd
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'src/corelib/tools/qlocale.h')
| -rw-r--r-- | src/corelib/tools/qlocale.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index c029f627b2..6c97a05ba8 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -565,7 +565,12 @@ public: }; // GENERATED PART ENDS HERE - enum MeasurementSystem { MetricSystem, ImperialSystem }; + enum MeasurementSystem { + MetricSystem, + ImperialUSSystem, + ImperialUKSystem, + ImperialSystem = ImperialUSSystem // Qt 4 compatibility + }; enum FormatType { LongFormat, ShortFormat, NarrowFormat }; enum NumberOption { |