diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-28 12:53:46 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-28 13:59:00 (GMT) |
| commit | 869a1c838ec58051f355552435049b58c6fbe354 (patch) | |
| tree | 0ade6166dd12695edf311a5728dead8996b92a9a /tests | |
| parent | 0ee221b374ffef3657247be4c78e05689e04bef7 (diff) | |
| download | Qt-869a1c838ec58051f355552435049b58c6fbe354.zip Qt-869a1c838ec58051f355552435049b58c6fbe354.tar.gz Qt-869a1c838ec58051f355552435049b58c6fbe354.tar.bz2 | |
Changed the return value of QLocale::matchingLocales().
Instead of returning a QStringList, return the list of QLocale objects
that can be used directly.
Reviewed-by: axis
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/qlocale/window.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/manual/qlocale/window.cpp b/tests/manual/qlocale/window.cpp index 89e3ec6..38bbbe4 100644 --- a/tests/manual/qlocale/window.cpp +++ b/tests/manual/qlocale/window.cpp @@ -46,9 +46,8 @@ Window::Window() localeCombo->addItem("System", QLocale::system()); - QStringList locales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry); - foreach (const QString &name, locales) { - QLocale locale(name); + QList<QLocale> locales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry); + foreach (const QLocale &locale, locales) { QString label = QLocale::languageToString(locale.language()); label += QLatin1Char('/'); if (locale.script() != QLocale::AnyScript) { |