From 219e7bafa278792f7bde110d24333fb60b555c12 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 May 2020 15:22:52 +0200 Subject: QtGui: fix deprecated QChar conversions Conversions from non-char-types to QChar are going to be deprecated. Use QChar::fromUcs2(), fromUcs4(), QLatin1Char(), or convert the constructor argument to char16_t. Change-Id: Ib45ebd5560aa3a2bc460037ab09773607485c6e2 Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qkeysequence.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/kernel/qkeysequence.cpp') diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 2fc551c00b..7de2956367 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1311,7 +1311,7 @@ QString QKeySequencePrivate::keyName(int key, QKeySequence::SequenceFormat forma if (key && key < Qt::Key_Escape && key != Qt::Key_Space) { if (!QChar::requiresSurrogates(key)) { - p = QChar(ushort(key)).toUpper(); + p = QChar::fromUcs2(key).toUpper(); } else { p += QChar(QChar::highSurrogate(key)); p += QChar(QChar::lowSurrogate(key)); @@ -1348,7 +1348,7 @@ NonSymbol: // (Really depends on you locale) if (i >= numKeyNames) { if (!QChar::requiresSurrogates(key)) { - p = QChar(ushort(key)).toUpper(); + p = QChar::fromUcs2(key).toUpper(); } else { p += QChar(QChar::highSurrogate(key)); p += QChar(QChar::lowSurrogate(key)); -- cgit v1.2.3