1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QLocale: Fix failing test on Norwegian Bokmål

Browse Source 
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 <thiago.macieira@intel.com>
(cherry picked from commit d359035c804021f59da70a75d962bfeafd320a71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Mårten Nordheim 2025-03-17 16:49:05 +01:00 committed by Qt Cherry-pick Bot
parent b6ab8c113d
commit 70f13cfbb1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/text/qlocale/tst_qlocale.cpp
View File

@ -3155,7 +3155,7 @@ void tst_QLocale::debugOutput()
const auto params = [](const QLocale &loc) { const auto params = [](const QLocale &loc) {
return (QLocale::languageToString(loc.language()) return (QLocale::languageToString(loc.language())
+ u", " + QLocale::scriptToString(loc.script()) + u", " + QLocale::scriptToString(loc.script())
+ u", " + QLocale::territoryToString(loc.territory())).toLatin1(); + u", " + QLocale::territoryToString(loc.territory())).toUtf8();
}; };
const QLocale sys = QLocale::system(); const QLocale sys = QLocale::system();
QTest::ignoreMessage(QtMsgType::QtWarningMsg, QTest::ignoreMessage(QtMsgType::QtWarningMsg,