diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-07 15:22:52 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-11 09:02:44 +0000 |
| commit | 219e7bafa278792f7bde110d24333fb60b555c12 (patch) | |
| tree | 46b9f9f69552cc7ee2f39e01f846d285c526474a /src/gui/kernel/qkeysequence.cpp | |
| parent | 9e56d28663b7df82882d2d0dcc72f3a48bcc6cf9 (diff) | |
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 <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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)); |