diff options
Diffstat (limited to 'src/corelib/tools/qlocale.h')
-rw-r--r-- | src/corelib/tools/qlocale.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index ac05c8685d..8b424bbc3a 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -586,7 +586,8 @@ public: Serbia = 243, SaintBarthelemy = 244, SaintMartin = 245, - LastCountry = SaintMartin + LatinAmericaAndTheCaribbean = 246, + LastCountry = LatinAmericaAndTheCaribbean }; enum MeasurementSystem { MetricSystem, ImperialSystem }; @@ -665,6 +666,8 @@ public: MeasurementSystem measurementSystem() const; + Qt::LayoutDirection textDirection() const; + inline bool operator==(const QLocale &other) const; inline bool operator!=(const QLocale &other) const; @@ -684,11 +687,7 @@ public: struct Data { quint16 index; quint16 numberOptions; - } -#if (defined(__arm__) || defined(__ARMEL__)) - Q_PACKED -#endif - ; + }; private: friend struct QLocalePrivate; // ### We now use this field to pack an index into locale_data and NumberOptions. |