From 278acae61146fae4811bc3643516ff41cdff24fc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 9 May 2023 16:34:54 +0200 Subject: [PATCH] tst_QFont: fix printf-format mismatch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use qUtf16Printable() to convert QString to somthing consumable by %ls. Fixes the format/argument mismatch on non-Windows platforms: tst_qfont.cpp: In member function ‘void tst_QFont::italicOblique()’: tst_qfont.cpp:153:67: warning: format ‘%ls’ expects argument of type ‘wchar_t*’, but argument 2 has type ‘const ushort*’ {aka ‘const short unsigned int*’} [-Wformat=] 153 | QVERIFY2(f.italic(), qPrintable(QString::asprintf("Failed for font \"%ls\"", f.family().utf16()))); | ^~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ | | | const ushort* {aka const short unsigned int*} Amends 4bf82909f144e2e1c0231a90c42bd120a549c9da. Change-Id: I0c7e2dca91a093835d7dba8bff2e5ea78d3a926e Reviewed-by: Mårten Nordheim --- tests/auto/gui/text/qfont/tst_qfont.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index aaac904714..258ac1c2f7 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -150,7 +150,7 @@ void tst_QFont::italicOblique() continue; } QFont f = QFontDatabase::font(family, style, 12); - QVERIFY2(f.italic(), qPrintable(QString::asprintf("Failed for font \"%ls\"", f.family().utf16()))); + QVERIFY2(f.italic(), qPrintable(QString::asprintf("Failed for font \"%ls\"", qUtf16Printable(f.family())))); } } }