path: root/src/corelib/doc
diff options
authorMarc Mutz <>2015-11-12 09:59:37 +0100
committerMarc Mutz <>2015-11-21 14:25:55 +0000
commit1005b7a0dec049f200baa8c14066bd3bb1512d2f (patch)
treef5be4c477b58f8ebaf16ccc80ec4da5d942118e5 /src/corelib/doc
parent226ce6020ee4eb0ccec744500c350cf54a39f231 (diff)
Long live qUtf16Printable()
QString::asprintf() has the ability to take a ushort* array as obtained from QString::utf16() and insert that into the output with an %ls conversion. But no-one ever used this, because just passing QString::utf16() to QString::asprintf() creates a warning about wchar_t* expected, but ushort* provided. The new qUtf16Printable() macro adds the necessary casts (via void* to prevent any "type-punned pointer" warnings) to make passing QString::utf16() to QString::asprintf() work silently. This should greatly reduce the need to do a round-trip via utf-8 just to print the contents of a QString. [ChangeLog][QtCore] Added qUtf16Printable(). Change-Id: I7ddd8d2b2a2191c9faa26aca95d49850d94b287c Reviewed-by: Olivier Goffart (Woboq GmbH) <> Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/corelib/doc')
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index 6ff4f57945..ccf8399e0d 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -439,6 +439,11 @@ qWarning("%s: %s", qUtf8Printable(key), qUtf8Printable(value));
//! [37]
+//! [qUtf16Printable]
+qWarning("%ls: %ls", qUtf16Printable(key), qUtf16Printable(value));
+//! [qUtf16Printable]
//! [38]
struct Point2D