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/global/qcompilerdetection.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/corelib/global/qcompilerdetection.h') diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 7b86279670..6341d060f1 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1232,6 +1232,12 @@ # define QT_MAKE_CHECKED_ARRAY_ITERATOR(x, N) (x) #endif +/* + * "Weak overloads" - makes an otherwise confliciting overload weaker + * (by making it a template) + */ +#define Q_WEAK_OVERLOAD template + /* * Warning/diagnostic handling */ -- cgit v1.2.3