From 17c964c4e874ab59a2af7859ae23f5cb4ad01d36 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 12 Apr 2024 14:00:41 -0700 Subject: [PATCH] QMetaType: allow converting to/from QChar and char16_t Converting from char16_t to QString was already possible, going through a QChar. Change-Id: Ie28eadac333c4bcd8c08fffd17c5a41488ea5ba6 Reviewed-by: Edward Welbourne --- src/corelib/kernel/qmetatype.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 633a5fecaa..f845eb3239 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1173,6 +1173,9 @@ static constexpr struct : QMetaTypeModuleHelper QMETATYPE_CONVERTER_ASSIGN_QCHAR(ULong); QMETATYPE_CONVERTER_ASSIGN_QCHAR(UInt); QMETATYPE_CONVERTER_ASSIGN_QCHAR(ULongLong); + QMETATYPE_CONVERTER_ASSIGN_QCHAR(Char16); + + QMETATYPE_CONVERTER(Char16, QChar, result = source.unicode(); return true;) // conversions to QString QMETATYPE_CONVERTER_ASSIGN(QString, QChar);