diff options
Diffstat (limited to 'src/corelib/tools/qlocale.h')
| -rw-r--r-- | src/corelib/tools/qlocale.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index f965ae6562..145b67f9f1 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -55,9 +55,6 @@ class QLocalePrivate; class Q_CORE_EXPORT QLocale { Q_GADGET - Q_ENUMS(Language) - Q_ENUMS(Country) - Q_ENUMS(MeasurementSystem) friend class QString; friend class QStringRef; friend class QByteArray; @@ -781,12 +778,16 @@ public: }; // GENERATED PART ENDS HERE + Q_ENUM(Language) + Q_ENUM(Country) + enum MeasurementSystem { MetricSystem, ImperialUSSystem, ImperialUKSystem, ImperialSystem = ImperialUSSystem // Qt 4 compatibility }; + Q_ENUM(MeasurementSystem) enum FormatType { LongFormat, ShortFormat, NarrowFormat }; enum NumberOption { |