diff options
Diffstat (limited to 'src/corelib/tools/qlocale_symbian.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale_symbian.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp index 4d84de5665..09d74d0136 100644 --- a/src/corelib/tools/qlocale_symbian.cpp +++ b/src/corelib/tools/qlocale_symbian.cpp @@ -57,9 +57,6 @@ QT_BEGIN_NAMESPACE -// Located in qlocale.cpp -extern void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Country &cntry); - static TExtendedLocale _s60Locale; // Type definitions for runtime resolved function pointers @@ -825,13 +822,6 @@ QLocale QSystemLocale::fallbackLocale() const return QLocale(locale); } -/*! - Generic query method for locale data. Provides indirection. - Denotes the \a type of the query - with \a in as input data depending on the query. - - \sa QSystemLocale::QueryType -*/ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const { switch(type) { @@ -879,8 +869,9 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const TLanguage language = User::Language(); QString locale = QLatin1String(qt_symbianLocaleName(language)); QLocale::Language lang; + QLocale::Script script; QLocale::Country cntry; - getLangAndCountry(locale, lang, cntry); + QLocalePrivate::getLangAndCountry(locale, lang, script, cntry); if (type == LanguageId) return lang; // few iso codes have no country and will use this @@ -889,6 +880,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const return cntry; } + case ScriptId: + return QVariant(QLocale::AnyScript); case NegativeSign: case PositiveSign: break; |