Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl

Change-Id: I569a2246c9e8d70430e8c5405b9f3df2218078ee

1 files changed, 5 insertions, 1 deletions

diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
index 877c5d848f..b713c19447 100644
--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
+++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp
@@ -41,7 +41,9 @@
 
 #include <private/qmakearray_p.h>
 
+#include <QtCore/private/qstringiterator_p.h>
 #include <QtCore/QMetaMethod>
+
 #include <QtGui/QKeyEvent>
 #include <QtGui/private/qguiapplication_p.h>
 
@@ -574,7 +576,9 @@ static int keysymToQtKey_internal(xkb_keysym_t keysym, Qt::KeyboardModifiers mod
              // e.g CTRL + ۲ (arabic two), is mapped to CTRL + Qt::Key_2.
              qtKey = Qt::Key_0 + text.unicode()->digitValue();
          } else {
-             qtKey = text.unicode()->toUpper().unicode();
+             text = text.toUpper();
+             QStringIterator i(text);
+             qtKey = i.next(0);
          }
     }