summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/text/qstring
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2021-03-16 16:02:56 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2021-06-11 23:30:09 +0200
commit421c69fde579baf21cb0fd607a7cfd97e6e63220 (patch)
tree80cdc8b3735e91dcef86fcc83ab3545945d61989 /tests/auto/corelib/text/qstring
parent81fbcc4dc6e71981d50a117ae4264c92c973905b (diff)
Add .UTF-8 suffixes to locale-names passed to setlocale()
We use UTF-8 locales by default since Qt 6; and relatively few systems have the encoding-unspecified locales we were trying to use, with the result that the setlocale() calls all failed. Task-number: COIN-689 Change-Id: Id791ba269bf4abac29da3daa4fd01684ca9caa7a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib/text/qstring')
-rw-r--r--tests/auto/corelib/text/qstring/tst_qstring.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp
index 5b5367abcd..8329948ef1 100644
--- a/tests/auto/corelib/text/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp
@@ -5630,6 +5630,7 @@ void tst_QString::localeAwareCompare()
QFETCH(QString, s1);
QFETCH(QString, s2);
QFETCH(int, result);
+ locale += QStringLiteral(".UTF-8"); // So we don't have to repeat it on every data row !
if (!locale.isEmpty()) {
#if defined (Q_OS_DARWIN) || QT_CONFIG(icu)