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_win.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_win.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale_win.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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: |