diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2019-11-22 14:05:25 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-05-05 15:34:15 +0200 |
| commit | 419f42903154489e2dace8d1eba183036275448b (patch) | |
| tree | ddd30764c42290d88df2ff9fa1995c4abe0e73ab /tests/auto/testlib | |
| parent | a206f52acd175800688b9f4cce8e56df2632dab2 (diff) | |
QCoreApplication: force the process locale codec to UTF-8
As discussed in the mailing list and in the Qt Contributor Summit 2019.
Tested on Linux, macOS and FreeBSD, showing these fallbacks:
OS environment setlocale() call
FreeBSD empty "C.UTF-8"
FreeBSD LC_ALL=C "C.UTF-8"
Linux empty "C.UTF-8"
Linux LC_ALL=C "C.UTF-8"
Linux LANG=en_US "en_US.UTF-8"
Linux LANG=de_DE@euro "de_DE.UTF-8"
Linux LANG=en_GB.iso885915 "en_GB.UTF-8"
Linux LANG=hy_AM.armscii8 "hy_AM.UTF-8"
Linux LANG=ja_JP.sjis "ja_JP.UTF-8"
Linux LANG=ru_RU.koi8r "ru_RU.UTF-8"
macOS empty "UTF-8"
macOS LC_ALL=C "UTF-8"
Versions tested: FreeBSD 12.1, Linux w/ glibc 2.30, macOS 10.14.2.
See
* https://wiki.qt.io/Qt_Contributor_Summit_2019_-_QtCore
* https://lists.qt-project.org/pipermail/development/2019-October/037791.html
Change-Id: Ia2aa807ffa8a4c798425fffd15d97ddb4f35b0ae
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/testlib')
| -rwxr-xr-x | tests/auto/testlib/selftests/generate_expected_output.py | 4 | ||||
| -rw-r--r-- | tests/auto/testlib/selftests/tst_selftests.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 96fab44408..673c1ab3bd 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the release tools of the Qt Toolkit. @@ -263,7 +263,7 @@ def baseEnv(platname=None, keep += preserveLib cached = dict( - LC_ALL = 'C', # Use standard locale + LC_ALL = 'en-US.UTF-8', # Use standard locale # Avoid interference from any qtlogging.ini files, e.g. in # /etc/xdg/QtProject/, (must match tst_selftests.cpp's # processEnvironment()'s value): diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp index 84090c22ca..53c35dad65 100644 --- a/tests/auto/testlib/selftests/tst_selftests.cpp +++ b/tests/auto/testlib/selftests/tst_selftests.cpp @@ -632,6 +632,11 @@ static QProcessEnvironment processEnvironment() result.insert(QStringLiteral("QT_LOGGING_RULES"), // Must match generate_expected_output.py's main()'s value: QStringLiteral("*.debug=true;qt.*=false")); + +#if defined(Q_OS_UNIX) + // avoid the warning from QCoreApplication + result.insert(QStringLiteral("LC_ALL"), QStringLiteral("en_US.UTF-8")); +#endif } return result; } |