From 44da43e8e42272c61cf12c05314387c785bd9749 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 22 Jun 2020 11:44:34 +0200 Subject: QString: add char8_t overload of fromUtf8() Use the overload-with-template trick from P1423 to avoid ambiguities when existing callers pass 0 or nullptr. Add a qdoc-ignored macro to hide the fact that the overload is a template. [ChangeLog][QtCore][QString] Added char8_t overload of fromUtf8(). Change-Id: Iaa2d365bfa161ef36cc73fa3bad50aabf34d01db Reviewed-by: Thiago Macieira --- src/corelib/text/qstring.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/corelib/text/qstring.h') diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index f14644d956..b77c6134d5 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -658,6 +658,11 @@ public: { return fromUtf8_helper(str, (str && size == -1) ? int(strlen(str)) : size); } +#ifdef __cpp_char8_t + Q_WEAK_OVERLOAD + static inline QString fromUtf8(const char8_t *str, qsizetype size = -1) + { return fromUtf8(reinterpret_cast(str), int(size)); } +#endif static inline QString fromLocal8Bit(const char *str, int size = -1) { return fromLocal8Bit_helper(str, (str && size == -1) ? int(strlen(str)) : size); -- cgit v1.2.3