diff options
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/text/qlocale_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 6253766fd5..15a65f2203 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -651,7 +651,7 @@ static void updateSystemPrivate() sys_locale->query(QSystemLocale::LocaleChanged); // Populate global with fallback as basis: - globalLocaleData = *sys_locale->fallbackUiLocaleData(); + globalLocaleData = locale_data[sys_locale->fallbackUiLocaleIndex()]; QVariant res = sys_locale->query(QSystemLocale::LanguageId); if (!res.isNull()) { diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index 96b4c4c4a0..6367bb1fda 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -129,7 +129,7 @@ public: virtual QVariant query(QueryType type, QVariant in = QVariant()) const; virtual QLocale fallbackUiLocale() const; - inline const QLocaleData *fallbackUiLocaleData() const; + inline uint fallbackUiLocaleIndex() const; private: QSystemLocale(bool); friend class QSystemLocaleSingleton; @@ -438,7 +438,7 @@ public: }; #ifndef QT_NO_SYSTEMLOCALE -const QLocaleData *QSystemLocale::fallbackUiLocaleData() const { return fallbackUiLocale().d->m_data; } +uint QSystemLocale::fallbackUiLocaleIndex() const { return fallbackUiLocale().d->m_index; } #endif template <> |