summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/text/qfont
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2023-05-09 16:34:54 +0200
committerMarc Mutz <marc.mutz@qt.io>2023-05-10 12:00:29 +0200
commit278acae61146fae4811bc3643516ff41cdff24fc (patch)
tree98a3db102f60206febf7deb1228e32220cf42e9f /tests/auto/gui/text/qfont
parentad398b2df6a686791165661b0fd5b83c5a69a8cd (diff)
tst_QFont: fix printf-format mismatch
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 <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto/gui/text/qfont')
-rw-r--r--tests/auto/gui/text/qfont/tst_qfont.cpp2
1 files changed, 1 insertions, 1 deletions
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()))));
}
}
}