diff options
| author | Mike FABIAN <maiku.fabian@gmail.com> | 2012-06-04 17:08:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 15:29:34 +0200 |
| commit | cc94a1c845c033080de85646e0e2a9100ff4c938 (patch) | |
| tree | 219c0f8de17d7534def5487069ea5e89ed0c7658 /src/corelib/tools/qlocale.cpp | |
| parent | 897e19f95ee91ec21bb9dd9f3157ee7333c9018f (diff) | |
Rename QSystemLocale::fallbackLocale() to QSystemLocale::fallbackUiLocale()
Suggested by Oswald Buddenhagen. This function is about the (main)
UI language, not about other locale features like number formatting etc.
It not in the public API anymore in Qt 5.0 so it can be renamed.
Change-Id: I2a23892c67e5813de4c0e57330749568777e9ee6
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qlocale.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index d799b817f2..67e47e56bb 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -480,7 +480,7 @@ void QLocalePrivate::updateSystemPrivate() // tell the object that the system locale has changed. sys_locale->query(QSystemLocale::LocaleChanged, QVariant()); - *system_data = *sys_locale->fallbackLocale().d->m_data; + *system_data = *sys_locale->fallbackUiLocale().d->m_data; QVariant res = sys_locale->query(QSystemLocale::LanguageId, QVariant()); if (!res.isNull()) { @@ -518,7 +518,7 @@ void QLocalePrivate::updateSystemPrivate() #ifdef QT_USE_ICU if (!default_data) - qt_initIcu(sys_locale->fallbackLocale().bcp47Name()); + qt_initIcu(sys_locale->fallbackUiLocale().bcp47Name()); #endif } |