diff options
| author | Florian Vichot <florian.vichot@gmail.com> | 2010-03-23 19:24:58 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-03-23 19:24:58 (GMT) |
| commit | 71832cfe6fa0005312f9a648f97d7ae9613a591f (patch) | |
| tree | d460f2a441f1179fa605a418892f296ab11ba717 /tests/auto/qstring | |
| parent | 6da690f031420957dec795c2899f337c296eff0b (diff) | |
| download | Qt-71832cfe6fa0005312f9a648f97d7ae9613a591f.zip Qt-71832cfe6fa0005312f9a648f97d7ae9613a591f.tar.gz Qt-71832cfe6fa0005312f9a648f97d7ae9613a591f.tar.bz2 | |
Use the default codec with QString::vsprintf()
QString::vsprintf was not decoding the format string according to QTextCodec::codecForCString,
thus making qDebug("ééé") display improperly, even if using a utf8 terminal, utf8 source files
and a codec for cstrings configured as utf8. Added a unit test.
Merge-request: 530
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Diffstat (limited to 'tests/auto/qstring')
| -rw-r--r-- | tests/auto/qstring/tst_qstring.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index d79ebb9..1bea4b7 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -938,6 +938,11 @@ void tst_QString::sprintf() // Check utf8 conversion for %s QCOMPARE(a.sprintf("%s", "\303\266\303\244\303\274\303\226\303\204\303\234\303\270\303\246\303\245\303\230\303\206\303\205"), QString("\366\344\374\326\304\334\370\346\345\330\306\305")); + // Check codecForCStrings is used to read non-modifier sequences in the format string + QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + QCOMPARE(a.sprintf("\303\251\303\250\303\240 %s", "\303\251\303\250\303\240"), QString("\303\251\303\250\303\240 \303\251\303\250\303\240")); + QTextCodec::setCodecForCStrings(0); + int n1; a.sprintf("%s%n%s", "hello", &n1, "goodbye"); QCOMPARE(n1, 5); |