summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/tools/qlocale.cpp4
-rw-r--r--src/corelib/tools/qlocale.qdoc2
-rw-r--r--src/corelib/tools/qlocale_mac.mm2
-rw-r--r--src/corelib/tools/qlocale_p.h2
-rw-r--r--src/corelib/tools/qlocale_unix.cpp2
-rw-r--r--src/corelib/tools/qlocale_win.cpp4
6 files changed, 8 insertions, 8 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
}
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index ed80984de3..daf248743d 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -776,7 +776,7 @@
*/
/*!
- \fn QLocale QSystemLocale::fallbackLocale() const
+ \fn QLocale QSystemLocale::fallbackUiLocale() const
\since 4.6
Returns the fallback locale obtained from the system.
diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm
index 7153875146..0a743324ef 100644
--- a/src/corelib/tools/qlocale_mac.mm
+++ b/src/corelib/tools/qlocale_mac.mm
@@ -370,7 +370,7 @@ static QVariant macQuoteString(QSystemLocale::QueryType type, const QStringRef &
#ifndef QT_NO_SYSTEMLOCALE
-QLocale QSystemLocale::fallbackLocale() const
+QLocale QSystemLocale::fallbackUiLocale() const
{
return QLocale(QString::fromUtf8(getMacLocaleName().constData()));
}
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h
index 673135587b..c2c1488966 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/tools/qlocale_p.h
@@ -118,7 +118,7 @@ public:
NativeCountryName // QString
};
virtual QVariant query(QueryType type, QVariant in) const;
- virtual QLocale fallbackLocale() const;
+ virtual QLocale fallbackUiLocale() const;
private:
QSystemLocale(bool);
diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/tools/qlocale_unix.cpp
index d46ced463c..9c841553c9 100644
--- a/src/corelib/tools/qlocale_unix.cpp
+++ b/src/corelib/tools/qlocale_unix.cpp
@@ -110,7 +110,7 @@ Q_GLOBAL_STATIC(QSystemLocaleData, qSystemLocaleData)
#ifndef QT_NO_SYSTEMLOCALE
-QLocale QSystemLocale::fallbackLocale() const
+QLocale QSystemLocale::fallbackUiLocale() const
{
QByteArray lang = qgetenv("LC_ALL");
if (lang.isEmpty())
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp
index e787f2fa2a..067338c8c4 100644
--- a/src/corelib/tools/qlocale_win.cpp
+++ b/src/corelib/tools/qlocale_win.cpp
@@ -653,7 +653,7 @@ QString QSystemLocalePrivate::winToQtFormat(const QString &sys_fmt)
return result;
}
-QLocale QSystemLocale::fallbackLocale() const
+QLocale QSystemLocale::fallbackUiLocale() const
{
return QLocale(QString::fromLatin1(getWinLocaleName()));
}
@@ -714,7 +714,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
if (type == LanguageId)
return lang;
if (cntry == QLocale::AnyCountry)
- return fallbackLocale().country();
+ return fallbackUiLocale().country();
return cntry;
}
case ScriptId: