From 70f13cfbb12b6afa248a1b157867b286735c7881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Mon, 17 Mar 2025 16:49:05 +0100 Subject: [PATCH] =?UTF-8?q?tst=5FQLocale:=20Fix=20failing=20test=20on=20No?= =?UTF-8?q?rwegian=20Bokm=C3=A5l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was failing because making it latin-1 turned it into: "Norwegian BokmÕl, Latin, Norway" While we expected: "Norwegian Bokm\xE5l, Latin, Norway" Amends e323d46cdaecffebb3f9fa55934e4eb4868611cf. Change-Id: I55fe21331d1cb3abd66780e103aee8b603509818 Reviewed-by: Thiago Macieira (cherry picked from commit d359035c804021f59da70a75d962bfeafd320a71) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index 6a15137e034..c8f33d5b74f 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -3155,7 +3155,7 @@ void tst_QLocale::debugOutput() const auto params = [](const QLocale &loc) { return (QLocale::languageToString(loc.language()) + u", " + QLocale::scriptToString(loc.script()) - + u", " + QLocale::territoryToString(loc.territory())).toLatin1(); + + u", " + QLocale::territoryToString(loc.territory())).toUtf8(); }; const QLocale sys = QLocale::system(); QTest::ignoreMessage(QtMsgType::QtWarningMsg,