diff options
| author | Mike FABIAN <maiku.fabian@gmail.com> | 2012-06-04 17:53:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 15:29:34 +0200 |
| commit | 897e19f95ee91ec21bb9dd9f3157ee7333c9018f (patch) | |
| tree | 66f35a8c87bc698c17562ab2beba4a22e1bb775e /tests | |
| parent | 7dfee3ffc5129307217eb949698c5088a4561642 (diff) | |
Check LANGUAGE as well in QSystemLocale::fallbackLocale
Because QSystemLocale::fallbackLocale() is about UI languages,
it makes sense to check LANGUAGE as well if appropriate.
Adapt tst_qlocale.cpp accordingly.
Suggested by Oswald Buddenhagen.
Change-Id: Ib2c9674081809e3251be4e34456b05210eebc010
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 7e12e42107..ddfa23eefb 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -437,7 +437,7 @@ void tst_QLocale::emptyCtor() // Get an environment free of any locale-related variables QStringList env; foreach (QString const& entry, QProcess::systemEnvironment()) { - if (entry.startsWith("LANG=") || entry.startsWith("LC_")) + if (entry.startsWith("LANG=") || entry.startsWith("LC_") || entry.startsWith("LANGUAGE=")) continue; env << entry; } |