aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmllocale_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2012-05-08 10:27:39 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-09 00:56:16 +0200
commit0b1ab6ba5553ecd0ba485d0d4a1aead83482fb46 (patch)
treee2b2cda30315f00d03e4ad3aec2adaba672606c6 /src/qml/qml/qqmllocale_p.h
parent1c9e021e97d6ce704f24e4f319e8fe0e714ae642 (diff)
Expose ImperialUSSystem and ImperialUKSystem to QML locale
New enums added to QLocale must be exposed in QML too. Change-Id: I3d4ca6c63d21eaedb2e78a01b7b3d6abace92318 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale_p.h')
-rw-r--r--src/qml/qml/qqmllocale_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index 2763ce4fc3..c701c1ca1c 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -94,7 +94,9 @@ public:
enum MeasurementSystem {
MetricSystem = QLocale::MetricSystem,
- ImperialSystem = QLocale::ImperialSystem
+ ImperialSystem = QLocale::ImperialSystem,
+ ImperialUSSystem = QLocale::ImperialUSSystem,
+ ImperialUKSystem = QLocale::ImperialUKSystem
};
enum FormatType {
LongFormat = QLocale::LongFormat,