Use QChar::fromUcs4() more

Change-Id: I02be41de92d84145186de9ac5f5ea3541a941964
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 5 insertions, 3 deletions

diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp
index 0ee44192b1..a93f648bc9 100644
--- a/src/gui/text/qharfbuzzng.cpp
+++ b/src/gui/text/qharfbuzzng.cpp
@@ -333,7 +333,10 @@ _hb_qt_unicode_compose(hb_unicode_funcs_t * /*ufuncs*/,
                        void * /*user_data*/)
 {
     // ### optimize
-    QString s = QString::fromUcs4(&a, 1) + QString::fromUcs4(&b, 1);
+    QString s;
+    s.reserve(4);
+    s += QChar::fromUcs4(a);
+    s += QChar::fromUcs4(b);
     QString normalized = s.normalized(QString::NormalizationForm_C);
 
     QStringIterator it(normalized);
diff --git a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
index e3a6aea99f..f46a1d556a 100644
--- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
@@ -76,8 +76,7 @@ static QString keyString(int sym, QChar::Category category)
     } else if (category == QChar::Other_PrivateUse) {
         return keyStringForPrivateUseQnxKey(sym);
     } else {
-        uint ucs4_sym = sym;
-        return QString::fromUcs4(&ucs4_sym, 1);
+        return QStringView{QChar::fromUcs4(sym)}.toString();
     }
 }