QtGui: use _L1 for for creating Latin-1 string literals

Task-number: QTBUG-98434
Change-Id: Idcb71c1d27125333a53b6bdd3e1af0d4c66617fa
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

9 files changed, 163 insertions, 146 deletions

diff --git a/src/gui/platform/darwin/qmacmime.mm b/src/gui/platform/darwin/qmacmime.mm
index f8c152e1c4..d5166a6408 100644
--- a/src/gui/platform/darwin/qmacmime.mm
+++ b/src/gui/platform/darwin/qmacmime.mm
@@ -61,6 +61,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 typedef QList<QMacInternalPasteboardMime*> MimeList;
 Q_GLOBAL_STATIC(MimeList, globalMimeList)
 Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList)
@@ -203,23 +205,23 @@ public:
 
 QString QMacPasteboardMimeAny::convertorName()
 {
-    return QLatin1String("Any-Mime");
+    return "Any-Mime"_L1;
 }
 
 QString QMacPasteboardMimeAny::flavorFor(const QString &mime)
 {
     // do not handle the mime type name in the drag pasteboard
-    if (mime == QLatin1String("application/x-qt-mime-type-name"))
+    if (mime == "application/x-qt-mime-type-name"_L1)
         return QString();
-    QString ret = QLatin1String("com.trolltech.anymime.") + mime;
-    return ret.replace(u'/', QLatin1String("--"));
+    QString ret = "com.trolltech.anymime."_L1 + mime;
+    return ret.replace(u'/', "--"_L1);
 }
 
 QString QMacPasteboardMimeAny::mimeFor(QString flav)
 {
-    const QString any_prefix = QLatin1String("com.trolltech.anymime.");
+    const QString any_prefix = "com.trolltech.anymime."_L1;
     if (flav.size() > any_prefix.length() && flav.startsWith(any_prefix))
-        return flav.mid(any_prefix.length()).replace(QLatin1String("--"), QLatin1String("/"));
+        return flav.mid(any_prefix.length()).replace("--"_L1, "/"_L1);
     return QString();
 }
 
@@ -233,7 +235,7 @@ QVariant QMacPasteboardMimeAny::convertToMime(const QString &mime, QList<QByteAr
     if (data.count() > 1)
         qWarning("QMacPasteboardMimeAny: Cannot handle multiple member data");
     QVariant ret;
-    if (mime == QLatin1String("text/plain"))
+    if (mime == "text/plain"_L1)
         ret = QString::fromUtf8(data.first());
     else
         ret = data.first();
@@ -243,7 +245,7 @@ QVariant QMacPasteboardMimeAny::convertToMime(const QString &mime, QList<QByteAr
 QList<QByteArray> QMacPasteboardMimeAny::convertFromMime(const QString &mime, QVariant data, QString)
 {
     QList<QByteArray> ret;
-    if (mime == QLatin1String("text/plain"))
+    if (mime == "text/plain"_L1)
         ret.append(data.toString().toUtf8());
     else
         ret.append(data.toByteArray());
@@ -269,13 +271,13 @@ public:
 
 QString QMacPasteboardMimeTypeName::convertorName()
 {
-    return QLatin1String("Qt-Mime-Type");
+    return "Qt-Mime-Type"_L1;
 }
 
 QString QMacPasteboardMimeTypeName::flavorFor(const QString &mime)
 {
-    if (mime == QLatin1String("application/x-qt-mime-type-name"))
-        return QLatin1String("com.trolltech.qt.MimeTypeName");
+    if (mime == "application/x-qt-mime-type-name"_L1)
+        return "com.trolltech.qt.MimeTypeName"_L1;
     return QString();
 }
 
@@ -298,7 +300,7 @@ QVariant QMacPasteboardMimeTypeName::convertToMime(const QString &, QList<QByteA
 QList<QByteArray> QMacPasteboardMimeTypeName::convertFromMime(const QString &, QVariant, QString)
 {
     QList<QByteArray> ret;
-    ret.append(QString(QLatin1String("x-qt-mime-type-name")).toUtf8());
+    ret.append(QString("x-qt-mime-type-name"_L1).toUtf8());
     return ret;
 }
 
@@ -316,20 +318,20 @@ public:
 
 QString QMacPasteboardMimePlainTextFallback::convertorName()
 {
-    return QLatin1String("PlainText (public.text)");
+    return "PlainText (public.text)"_L1;
 }
 
 QString QMacPasteboardMimePlainTextFallback::flavorFor(const QString &mime)
 {
-    if (mime == QLatin1String("text/plain"))
-        return QLatin1String("public.text");
+    if (mime == "text/plain"_L1)
+        return "public.text"_L1;
     return QString();
 }
 
 QString QMacPasteboardMimePlainTextFallback::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.text"))
-        return QLatin1String("text/plain");
+    if (flav == "public.text"_L1)
+        return "text/plain"_L1;
     return QString();
 }
 
@@ -343,7 +345,7 @@ QVariant QMacPasteboardMimePlainTextFallback::convertToMime(const QString &mimet
     if (data.count() > 1)
         qWarning("QMacPasteboardMimePlainTextFallback: Cannot handle multiple member data");
 
-    if (flavor == QLatin1String("public.text")) {
+    if (flavor == "public.text"_L1) {
         // Note that public.text is documented by Apple to have an undefined encoding. From
         // testing it seems that utf8 is normally used, at least by Safari on iOS.
         const QByteArray &firstData = data.first();
@@ -360,7 +362,7 @@ QList<QByteArray> QMacPasteboardMimePlainTextFallback::convertFromMime(const QSt
 {
     QList<QByteArray> ret;
     QString string = data.toString();
-    if (flavor == QLatin1String("public.text"))
+    if (flavor == "public.text"_L1)
         ret.append(string.toUtf8());
     return ret;
 }
@@ -379,39 +381,38 @@ public:
 
 QString QMacPasteboardMimeUnicodeText::convertorName()
 {
-    return QLatin1String("UnicodeText");
+    return "UnicodeText"_L1;
 }
 
 QString QMacPasteboardMimeUnicodeText::flavorFor(const QString &mime)
 {
-    if (mime == QLatin1String("text/plain"))
-        return QLatin1String("public.utf16-plain-text");
-    int i = mime.indexOf(QLatin1String("charset="));
+    if (mime == "text/plain"_L1)
+        return "public.utf16-plain-text"_L1;
+    int i = mime.indexOf("charset="_L1);
     if (i >= 0) {
         QString cs(mime.mid(i+8).toLower());
         i = cs.indexOf(u';');
         if (i>=0)
             cs = cs.left(i);
-        if (cs == QLatin1String("system"))
-            return QLatin1String("public.utf8-plain-text");
-        else if (cs == QLatin1String("iso-10646-ucs-2")
-                 || cs == QLatin1String("utf16"))
-            return QLatin1String("public.utf16-plain-text");
+        if (cs == "system"_L1)
+            return "public.utf8-plain-text"_L1;
+        else if (cs == "iso-10646-ucs-2"_L1 || cs == "utf16"_L1)
+            return "public.utf16-plain-text"_L1;
     }
     return QString();
 }
 
 QString QMacPasteboardMimeUnicodeText::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.utf16-plain-text") || flav == QLatin1String("public.utf8-plain-text"))
-        return QLatin1String("text/plain");
+    if (flav == "public.utf16-plain-text"_L1 || flav == "public.utf8-plain-text"_L1)
+        return "text/plain"_L1;
     return QString();
 }
 
 bool QMacPasteboardMimeUnicodeText::canConvert(const QString &mime, QString flav)
 {
-    return (mime == QLatin1String("text/plain")
-            && (flav == QLatin1String("public.utf8-plain-text") || (flav == QLatin1String("public.utf16-plain-text"))));
+    return (mime == "text/plain"_L1
+            && (flav == "public.utf8-plain-text"_L1 || (flav == "public.utf16-plain-text"_L1)));
 }
 
 QVariant QMacPasteboardMimeUnicodeText::convertToMime(const QString &mimetype, QList<QByteArray> data, QString flavor)
@@ -421,9 +422,9 @@ QVariant QMacPasteboardMimeUnicodeText::convertToMime(const QString &mimetype, Q
     const QByteArray &firstData = data.first();
     // I can only handle two types (system and unicode) so deal with them that way
     QVariant ret;
-    if (flavor == QLatin1String("public.utf8-plain-text")) {
+    if (flavor == "public.utf8-plain-text"_L1) {
         ret = QString::fromUtf8(firstData);
-    } else if (flavor == QLatin1String("public.utf16-plain-text")) {
+    } else if (flavor == "public.utf16-plain-text"_L1) {
         QString str = QStringDecoder(QStringDecoder::Utf16)(firstData);
         ret = str;
     } else {
@@ -436,9 +437,9 @@ QList<QByteArray> QMacPasteboardMimeUnicodeText::convertFromMime(const QString &
 {
     QList<QByteArray> ret;
     QString string = data.toString();
-    if (flavor == QLatin1String("public.utf8-plain-text"))
+    if (flavor == "public.utf8-plain-text"_L1)
         ret.append(string.toUtf8());
-    else if (flavor == QLatin1String("public.utf16-plain-text")) {
+    else if (flavor == "public.utf16-plain-text"_L1) {
         QStringEncoder::Flags f;
 #if defined(Q_OS_MACOS)
         // Some applications such as Microsoft Excel, don't deal well with
@@ -472,20 +473,20 @@ public:
 
 QString QMacPasteboardMimeHTMLText::convertorName()
 {
-    return QLatin1String("HTML");
+    return "HTML"_L1;
 }
 
 QString QMacPasteboardMimeHTMLText::flavorFor(const QString &mime)
 {
-    if (mime == QLatin1String("text/html"))
-        return QLatin1String("public.html");
+    if (mime == "text/html"_L1)
+        return "public.html"_L1;
     return QString();
 }
 
 QString QMacPasteboardMimeHTMLText::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.html"))
-        return QLatin1String("text/html");
+    if (flav == "public.html"_L1)
+        return "text/html"_L1;
     return QString();
 }
 
@@ -526,20 +527,20 @@ public:
 
 QString QMacPasteboardMimeRtfText::convertorName()
 {
-    return QLatin1String("Rtf");
+    return "Rtf"_L1;
 }
 
 QString QMacPasteboardMimeRtfText::flavorFor(const QString &mime)
 {
-    if (mime == QLatin1String("text/html"))
-        return QLatin1String("public.rtf");
+    if (mime == "text/html"_L1)
+        return "public.rtf"_L1;
     return QString();
 }
 
 QString QMacPasteboardMimeRtfText::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.rtf"))
-        return QLatin1String("text/html");
+    if (flav == "public.rtf"_L1)
+        return "text/html"_L1;
     return QString();
 }
 
@@ -602,26 +603,26 @@ public:
 
 QString QMacPasteboardMimeFileUri::convertorName()
 {
-    return QLatin1String("FileURL");
+    return "FileURL"_L1;
 }
 
 QString QMacPasteboardMimeFileUri::flavorFor(const QString &mime)
 {
-    if (mime == QLatin1String("text/uri-list"))
-        return QLatin1String("public.file-url");
+    if (mime == "text/uri-list"_L1)
+        return "public.file-url"_L1;
     return QString();
 }
 
 QString QMacPasteboardMimeFileUri::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.file-url"))
-        return QLatin1String("text/uri-list");
+    if (flav == "public.file-url"_L1)
+        return "text/uri-list"_L1;
     return QString();
 }
 
 bool QMacPasteboardMimeFileUri::canConvert(const QString &mime, QString flav)
 {
-    return mime == QLatin1String("text/uri-list") && flav == QLatin1String("public.file-url");
+    return mime == "text/uri-list"_L1 && flav == "public.file-url"_L1;
 }
 
 QVariant QMacPasteboardMimeFileUri::convertToMime(const QString &mime, QList<QByteArray> data, QString flav)
@@ -642,7 +643,7 @@ QVariant QMacPasteboardMimeFileUri::convertToMime(const QString &mime, QList<QBy
             url = QUrl::fromNSURL(nsurl);
         }
 
-        if (url.host().toLower() == QLatin1String("localhost"))
+        if (url.host().toLower() == "localhost"_L1)
             url.setHost(QString());
 
         url.setPath(url.path().normalized(QString::NormalizationForm_C));
@@ -660,10 +661,10 @@ QList<QByteArray> QMacPasteboardMimeFileUri::convertFromMime(const QString &mime
     for (int i = 0; i < urls.size(); ++i) {
         QUrl url = urls.at(i).toUrl();
         if (url.scheme().isEmpty())
-            url.setScheme(QLatin1String("file"));
-        if (url.scheme() == QLatin1String("file")) {
+            url.setScheme("file"_L1);
+        if (url.scheme() == "file"_L1) {
             if (url.host().isEmpty())
-                url.setHost(QLatin1String("localhost"));
+                url.setHost("localhost"_L1);
             url.setPath(url.path().normalized(QString::NormalizationForm_D));
         }
         if (url.isLocalFile())
@@ -691,27 +692,27 @@ public:
 
 QString QMacPasteboardMimeUrl::convertorName()
 {
-    return QLatin1String("URL");
+    return "URL"_L1;
 }
 
 QString QMacPasteboardMimeUrl::flavorFor(const QString &mime)
 {
-    if (mime.startsWith(QLatin1String("text/uri-list")))
-        return QLatin1String("public.url");
+    if (mime.startsWith("text/uri-list"_L1))
+        return "public.url"_L1;
     return QString();
 }
 
 QString QMacPasteboardMimeUrl::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.url"))
-        return QLatin1String("text/uri-list");
+    if (flav == "public.url"_L1)
+        return "text/uri-list"_L1;
     return QString();
 }
 
 bool QMacPasteboardMimeUrl::canConvert(const QString &mime, QString flav)
 {
-    return flav == QLatin1String("public.url")
-            && mime == QLatin1String("text/uri-list");
+    return flav == "public.url"_L1
+            && mime == "text/uri-list"_L1;
 }
 
 QVariant QMacPasteboardMimeUrl::convertToMime(const QString &mime, QList<QByteArray> data, QString flav)
@@ -722,7 +723,7 @@ QVariant QMacPasteboardMimeUrl::convertToMime(const QString &mime, QList<QByteAr
     QList<QVariant> ret;
     for (int i=0; i<data.size(); ++i) {
         QUrl url = QUrl::fromEncoded(data.at(i));
-        if (url.host().toLower() == QLatin1String("localhost"))
+        if (url.host().toLower() == "localhost"_L1)
             url.setHost(QString());
         url.setPath(url.path().normalized(QString::NormalizationForm_C));
         ret.append(url);
@@ -740,10 +741,10 @@ QList<QByteArray> QMacPasteboardMimeUrl::convertFromMime(const QString &mime, QV
     for (int i=0; i<urls.size(); ++i) {
         QUrl url = urls.at(i).toUrl();
         if (url.scheme().isEmpty())
-            url.setScheme(QLatin1String("file"));
-        if (url.scheme() == QLatin1String("file")) {
+            url.setScheme("file"_L1);
+        if (url.scheme() == "file"_L1) {
             if (url.host().isEmpty())
-                url.setHost(QLatin1String("localhost"));
+                url.setHost("localhost"_L1);
             url.setPath(url.path().normalized(QString::NormalizationForm_D));
         }
         ret.append(url.toEncoded());
@@ -766,7 +767,7 @@ public:
 
 QString QMacPasteboardMimeVCard::convertorName()
 {
-    return QLatin1String("VCard");
+    return "VCard"_L1;
 }
 
 bool QMacPasteboardMimeVCard::canConvert(const QString &mime, QString flav)
@@ -776,22 +777,22 @@ bool QMacPasteboardMimeVCard::canConvert(const QString &mime, QString flav)
 
 QString QMacPasteboardMimeVCard::flavorFor(const QString &mime)
 {
-    if (mime.startsWith(QLatin1String("text/vcard")))
-        return QLatin1String("public.vcard");
+    if (mime.startsWith("text/vcard"_L1))
+        return "public.vcard"_L1;
     return QString();
 }
 
 QString QMacPasteboardMimeVCard::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.vcard"))
-        return QLatin1String("text/vcard");
+    if (flav == "public.vcard"_L1)
+        return "text/vcard"_L1;
     return QString();
 }
 
 QVariant QMacPasteboardMimeVCard::convertToMime(const QString &mime, QList<QByteArray> data, QString)
 {
     QByteArray cards;
-    if (mime == QLatin1String("text/vcard")) {
+    if (mime == "text/vcard"_L1) {
         for (int i=0; i<data.size(); ++i)
             cards += data[i];
     }
@@ -801,7 +802,7 @@ QVariant QMacPasteboardMimeVCard::convertToMime(const QString &mime, QList<QByte
 QList<QByteArray> QMacPasteboardMimeVCard::convertFromMime(const QString &mime, QVariant data, QString)
 {
     QList<QByteArray> ret;
-    if (mime == QLatin1String("text/vcard"))
+    if (mime == "text/vcard"_L1)
         ret.append(data.toString().toUtf8());
     return ret;
 }
@@ -823,26 +824,26 @@ public:
 
 QString QMacPasteboardMimeTiff::convertorName()
 {
-    return QLatin1String("Tiff");
+    return "Tiff"_L1;
 }
 
 QString QMacPasteboardMimeTiff::flavorFor(const QString &mime)
 {
-    if (mime.startsWith(QLatin1String("application/x-qt-image")))
-        return QLatin1String("public.tiff");
+    if (mime.startsWith("application/x-qt-image"_L1))
+        return "public.tiff"_L1;
     return QString();
 }
 
 QString QMacPasteboardMimeTiff::mimeFor(QString flav)
 {
-    if (flav == QLatin1String("public.tiff"))
-        return QLatin1String("application/x-qt-image");
+    if (flav == "public.tiff"_L1)
+        return "application/x-qt-image"_L1;
     return QString();
 }
 
 bool QMacPasteboardMimeTiff::canConvert(const QString &mime, QString flav)
 {
-    return flav == QLatin1String("public.tiff") && mime == QLatin1String("application/x-qt-image");
+    return flav == "public.tiff"_L1 && mime == "application/x-qt-image"_L1;
 }
 
 QVariant QMacPasteboardMimeTiff::convertToMime(const QString &mime, QList<QByteArray> data, QString flav)
diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp
index a9e508c666..2302d074ea 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp
+++ b/src/gui/platform/unix/dbusmenu/qdbusmenuadaptor.cpp
@@ -59,6 +59,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QDBusMenuAdaptor::QDBusMenuAdaptor(QDBusPlatformMenu *topLevelMenu)
     : QDBusAbstractAdaptor(topLevelMenu)
     , m_topLevelMenu(topLevelMenu)
@@ -73,12 +75,12 @@ QDBusMenuAdaptor::~QDBusMenuAdaptor()
 QString QDBusMenuAdaptor::status() const
 {
     qCDebug(qLcMenu);
-    return QLatin1String("normal");
+    return "normal"_L1;
 }
 
 QString QDBusMenuAdaptor::textDirection() const
 {
-    return QLocale().textDirection() == Qt::RightToLeft ? QLatin1String("rtl") : QLatin1String("ltr");
+    return QLocale().textDirection() == Qt::RightToLeft ? "rtl"_L1 : "ltr"_L1;
 }
 
 uint QDBusMenuAdaptor::version() const
@@ -117,12 +119,12 @@ void QDBusMenuAdaptor::Event(int id, const QString &eventId, const QDBusVariant
     Q_UNUSED(data);
     Q_UNUSED(timestamp);
     QDBusPlatformMenuItem *item = QDBusPlatformMenuItem::byId(id);
-    qCDebug(qLcMenu) << id << (item ? item->text() : QLatin1String("")) << eventId;
-    if (item && eventId == QLatin1String("clicked"))
+    qCDebug(qLcMenu) << id << (item ? item->text() : ""_L1) << eventId;
+    if (item && eventId == "clicked"_L1)
         item->trigger();
-    if (item && eventId == QLatin1String("hovered"))
+    if (item && eventId == "hovered"_L1)
         emit item->hovered();
-    if (eventId == QLatin1String("closed")) {
+    if (eventId == "closed"_L1) {
         // There is no explicit AboutToHide method, so map closed event to aboutToHide method
         const QDBusPlatformMenu *menu = nullptr;
         if (item)
diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp
index b13c875854..a7b30c8660 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp
+++ b/src/gui/platform/unix/dbusmenu/qdbusmenubar.cpp
@@ -42,11 +42,13 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /* note: do not change these to QStringLiteral;
    we are unloaded before QtDBus is done using the strings.
  */
-#define REGISTRAR_SERVICE QLatin1String("com.canonical.AppMenu.Registrar")
-#define REGISTRAR_PATH QLatin1String("/com/canonical/AppMenu/Registrar")
+#define REGISTRAR_SERVICE "com.canonical.AppMenu.Registrar"_L1
+#define REGISTRAR_PATH "/com/canonical/AppMenu/Registrar"_L1
 
 QDBusMenuBar::QDBusMenuBar()
     : QPlatformMenuBar()
diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp
index ce95ee96b4..c1de0d2cb8 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp
+++ b/src/gui/platform/unix/dbusmenu/qdbusmenuconnection.cpp
@@ -55,12 +55,14 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_DECLARE_LOGGING_CATEGORY(qLcMenu)
 
-const QString StatusNotifierWatcherService = QLatin1String("org.kde.StatusNotifierWatcher");
-const QString StatusNotifierWatcherPath = QLatin1String("/StatusNotifierWatcher");
-const QString StatusNotifierItemPath = QLatin1String("/StatusNotifierItem");
-const QString MenuBarPath = QLatin1String("/MenuBar");
+const QString StatusNotifierWatcherService = "org.kde.StatusNotifierWatcher"_L1;
+const QString StatusNotifierWatcherPath = "/StatusNotifierWatcher"_L1;
+const QString StatusNotifierItemPath = "/StatusNotifierItem"_L1;
+const QString MenuBarPath = "/MenuBar"_L1;
 
 /*!
     \class QDBusMenuConnection
@@ -131,7 +133,7 @@ bool QDBusMenuConnection::registerTrayIconWithWatcher(QDBusTrayIcon *item)
     Q_UNUSED(item);
     QDBusMessage registerMethod = QDBusMessage::createMethodCall(
                 StatusNotifierWatcherService, StatusNotifierWatcherPath, StatusNotifierWatcherService,
-                QLatin1String("RegisterStatusNotifierItem"));
+                "RegisterStatusNotifierItem"_L1);
     registerMethod.setArguments(QVariantList() << m_connection.baseService());
     return m_connection.callWithCallback(registerMethod, this, SIGNAL(trayIconRegistered()), SLOT(dbusError(QDBusError)));
 }
diff --git a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp
index c356797102..d000b9aa63 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp
+++ b/src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp
@@ -56,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QT_IMPL_METATYPE_EXTERN(QDBusMenuItem)
 QT_IMPL_METATYPE_EXTERN(QDBusMenuItemList)
 QT_IMPL_METATYPE_EXTERN(QDBusMenuItemKeys)
@@ -103,7 +105,7 @@ uint QDBusMenuLayoutItem::populate(int id, int depth, const QStringList &propert
     qCDebug(qLcMenu) << id << "depth" << depth << propertyNames;
     m_id = id;
     if (id == 0) {
-        m_properties.insert(QLatin1String("children-display"), QLatin1String("submenu"));
+        m_properties.insert("children-display"_L1, "submenu"_L1);
         if (topLevelMenu)
             populate(topLevelMenu, depth, propertyNames);
         return 1; // revision
@@ -192,34 +194,34 @@ QDBusMenuItem::QDBusMenuItem(const QDBusPlatformMenuItem *item)
     : m_id(item->dbusID())
 {
     if (item->isSeparator()) {
-        m_properties.insert(QLatin1String("type"), QLatin1String("separator"));
+        m_properties.insert("type"_L1, "separator"_L1);
     } else {
-        m_properties.insert(QLatin1String("label"), convertMnemonic(item->text()));
+        m_properties.insert("label"_L1, convertMnemonic(item->text()));
         if (item->menu())
-            m_properties.insert(QLatin1String("children-display"), QLatin1String("submenu"));
-        m_properties.insert(QLatin1String("enabled"), item->isEnabled());
+            m_properties.insert("children-display"_L1, "submenu"_L1);
+        m_properties.insert("enabled"_L1, item->isEnabled());
         if (item->isCheckable()) {
-            QString toggleType = item->hasExclusiveGroup() ? QLatin1String("radio") : QLatin1String("checkmark");
-            m_properties.insert(QLatin1String("toggle-type"), toggleType);
-            m_properties.insert(QLatin1String("toggle-state"), item->isChecked() ? 1 : 0);
+            QString toggleType = item->hasExclusiveGroup() ? "radio"_L1 : "checkmark"_L1;
+            m_properties.insert("toggle-type"_L1, toggleType);
+            m_properties.insert("toggle-state"_L1, item->isChecked() ? 1 : 0);
         }
 #ifndef QT_NO_SHORTCUT
         const QKeySequence &scut = item->shortcut();
         if (!scut.isEmpty()) {
             QDBusMenuShortcut shortcut = convertKeySequence(scut);
-            m_properties.insert(QLatin1String("shortcut"), QVariant::fromValue(shortcut));
+            m_properties.insert("shortcut"_L1, QVariant::fromValue(shortcut));
         }
 #endif
         const QIcon &icon = item->icon();
         if (!icon.name().isEmpty()) {
-            m_properties.insert(QLatin1String("icon-name"), icon.name());
+            m_properties.insert("icon-name"_L1, icon.name());
         } else if (!icon.isNull()) {
             QBuffer buf;
             icon.pixmap(16).save(&buf, "PNG");
-            m_properties.insert(QLatin1String("icon-data"), buf.data());
+            m_properties.insert("icon-data"_L1, buf.data());
         }
     }
-    m_properties.insert(QLatin1String("visible"), item->isVisible());
+    m_properties.insert("visible"_L1, item->isVisible());
 }
 
 QDBusMenuItemList QDBusMenuItem::items(const QList<int> &ids, const QStringList &propertyNames)
@@ -264,9 +266,9 @@ QDBusMenuShortcut QDBusMenuItem::convertKeySequence(const QKeySequence &sequence
             tokens << QStringLiteral("Num");
 
         QString keyName = QKeySequencePrivate::keyName(key, QKeySequence::PortableText);
-        if (keyName == QLatin1String("+"))
+        if (keyName == "+"_L1)
             tokens << QStringLiteral("plus");
-        else if (keyName == QLatin1String("-"))
+        else if (keyName == "-"_L1)
             tokens << QStringLiteral("minus");
         else
             tokens << keyName;
diff --git a/src/gui/platform/unix/dbustray/qdbustrayicon.cpp b/src/gui/platform/unix/dbustray/qdbustrayicon.cpp
index 57c1b65cde..b165877bee 100644
--- a/src/gui/platform/unix/dbustray/qdbustrayicon.cpp
+++ b/src/gui/platform/unix/dbustray/qdbustrayicon.cpp
@@ -72,6 +72,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_LOGGING_CATEGORY(qLcTray, "qt.qpa.tray")
 
 static QString iconTempPath()
@@ -79,8 +81,8 @@ static QString iconTempPath()
     QString tempPath = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
     if (!tempPath.isEmpty()) {
         QString flatpakId = qEnvironmentVariable("FLATPAK_ID");
-        if (!flatpakId.isEmpty() && QFileInfo::exists(QLatin1String("/.flatpak-info")))
-            tempPath += QLatin1String("/app/") + flatpakId;
+        if (!flatpakId.isEmpty() && QFileInfo::exists("/.flatpak-info"_L1))
+            tempPath += "/app/"_L1 + flatpakId;
         return tempPath;
     }
 
@@ -110,7 +112,7 @@ static int instanceCount = 0;
 
 static inline QString tempFileTemplate()
 {
-    static const QString TempFileTemplate = iconTempPath() + QLatin1String("/qt-trayicon-XXXXXX.png");
+    static const QString TempFileTemplate = iconTempPath() + "/qt-trayicon-XXXXXX.png"_L1;
     return TempFileTemplate;
 }
 
@@ -212,7 +214,7 @@ QTemporaryFile *QDBusTrayIcon::tempIcon(const QIcon &icon)
         QDBusConnection session = QDBusConnection::sessionBus();
         uint pid = session.interface()->servicePid(KDEWatcherService).value();
         QString processName = QLockFilePrivate::processNameByPid(pid);
-        necessary = processName.endsWith(QLatin1String("indicator-application-service"));
+        necessary = processName.endsWith("indicator-application-service"_L1);
         if (!necessary) {
             necessary = session.interface()->isServiceRegistered(
                 QStringLiteral("com.canonical.indicator.application"));
@@ -346,7 +348,7 @@ void QDBusTrayIcon::showMessage(const QString &title, const QString &msg, const
     int urgency = static_cast<int>(iconType) - 1;
     if (urgency < 0) // no icon
         urgency = 0;
-    hints.insert(QLatin1String("urgency"), QVariant(urgency));
+    hints.insert("urgency"_L1, QVariant(urgency));
     m_notifier->notify(QCoreApplication::applicationName(), 0,
                        m_attentionIconName, title, msg, notificationActions, hints, msecs);
 }
diff --git a/src/gui/platform/unix/qgenericunixservices.cpp b/src/gui/platform/unix/qgenericunixservices.cpp
index b1ff06e040..deed63285b 100644
--- a/src/gui/platform/unix/qgenericunixservices.cpp
+++ b/src/gui/platform/unix/qgenericunixservices.cpp
@@ -73,6 +73,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 #if QT_CONFIG(multiprocess)
 
 enum { debug = 0 };
@@ -146,7 +148,7 @@ static inline bool detectWebBrowser(const QByteArray &desktop,
             return true;
         // Konqueror launcher
         if (checkExecutable(QStringLiteral("kfmclient"), browser)) {
-            browser->append(QLatin1String(" exec"));
+            browser->append(" exec"_L1);
             return true;
         }
     } else if (desktop == QByteArray("GNOME")) {
@@ -166,7 +168,7 @@ static inline bool launch(const QString &launcher, const QUrl &url)
     if (debug)
         qDebug("Launching %s", qPrintable(command));
 #if !QT_CONFIG(process)
-    const bool ok = ::system(qPrintable(command + QLatin1String(" &")));
+    const bool ok = ::system(qPrintable(command + " &"_L1));
 #else
     QStringList args = QProcess::splitCommand(command);
     bool ok = false;
@@ -183,7 +185,7 @@ static inline bool launch(const QString &launcher, const QUrl &url)
 #if QT_CONFIG(dbus)
 static inline bool checkNeedPortalSupport()
 {
-    return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, QLatin1String("flatpak-info")).isEmpty() || qEnvironmentVariableIsSet("SNAP");
+    return !QStandardPaths::locate(QStandardPaths::RuntimeLocation, "flatpak-info"_L1).isEmpty() || qEnvironmentVariableIsSet("SNAP");
 }
 
 static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
@@ -200,15 +202,15 @@ static inline QDBusMessage xdgDesktopPortalOpenFile(const QUrl &url)
 #ifdef O_PATH
     const int fd = qt_safe_open(QFile::encodeName(url.toLocalFile()), O_PATH);
     if (fd != -1) {
-        QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
-                                                              QLatin1String("/org/freedesktop/portal/desktop"),
-                                                              QLatin1String("org.freedesktop.portal.OpenURI"),
-                                                              QLatin1String("OpenFile"));
+        QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
+                                                              "/org/freedesktop/portal/desktop"_L1,
+                                                              "org.freedesktop.portal.OpenURI"_L1,
+                                                              "OpenFile"_L1);
 
         QDBusUnixFileDescriptor descriptor;
         descriptor.giveFileDescriptor(fd);
 
-        const QVariantMap options = {{QLatin1String("writable"), true}};
+        const QVariantMap options = {{"writable"_L1, true}};
 
         // FIXME parent_window_id
         message << QString() << QVariant::fromValue(descriptor) << options;
@@ -235,10 +237,10 @@ static inline QDBusMessage xdgDesktopPortalOpenUrl(const QUrl &url)
     //                This key only takes effect the uri points to a local file that is exported in the document portal,
     //                and the chosen application is sandboxed itself.
 
-    QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
-                                                          QLatin1String("/org/freedesktop/portal/desktop"),
-                                                          QLatin1String("org.freedesktop.portal.OpenURI"),
-                                                          QLatin1String("OpenURI"));
+    QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
+                                                          "/org/freedesktop/portal/desktop"_L1,
+                                                          "org.freedesktop.portal.OpenURI"_L1,
+                                                          "OpenURI"_L1);
     // FIXME parent_window_id and handle writable option
     message << QString() << url.toString() << QVariantMap();
 
@@ -259,14 +261,14 @@ static inline QDBusMessage xdgDesktopPortalSendEmail(const QUrl &url)
 
     QUrlQuery urlQuery(url);
     QVariantMap options;
-    options.insert(QLatin1String("address"), url.path());
-    options.insert(QLatin1String("subject"), urlQuery.queryItemValue(QLatin1String("subject")));
-    options.insert(QLatin1String("body"), urlQuery.queryItemValue(QLatin1String("body")));
+    options.insert("address"_L1, url.path());
+    options.insert("subject"_L1, urlQuery.queryItemValue("subject"_L1));
+    options.insert("body"_L1, urlQuery.queryItemValue("body"_L1));
 
     // O_PATH seems to be present since Linux 2.6.39, which is not case of RHEL 6
 #ifdef O_PATH
     QList<QDBusUnixFileDescriptor> attachments;
-    const QStringList attachmentUris = urlQuery.allQueryItemValues(QLatin1String("attachment"));
+    const QStringList attachmentUris = urlQuery.allQueryItemValues("attachment"_L1);
 
     for (const QString &attachmentUri : attachmentUris) {
         const int fd = qt_safe_open(QFile::encodeName(attachmentUri), O_PATH);
@@ -277,13 +279,13 @@ static inline QDBusMessage xdgDesktopPortalSendEmail(const QUrl &url)
         }
     }
 
-    options.insert(QLatin1String("attachment_fds"), QVariant::fromValue(attachments));
+    options.insert("attachment_fds"_L1, QVariant::fromValue(attachments));
 #endif
 
-    QDBusMessage message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.portal.Desktop"),
-                                                          QLatin1String("/org/freedesktop/portal/desktop"),
-                                                          QLatin1String("org.freedesktop.portal.Email"),
-                                                          QLatin1String("ComposeEmail"));
+    QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.portal.Desktop"_L1,
+                                                          "/org/freedesktop/portal/desktop"_L1,
+                                                          "org.freedesktop.portal.Email"_L1,
+                                                          "ComposeEmail"_L1);
 
     // FIXME parent_window_id
     message << QString() << options;
@@ -300,7 +302,7 @@ QByteArray QGenericUnixServices::desktopEnvironment() const
 
 bool QGenericUnixServices::openUrl(const QUrl &url)
 {
-    if (url.scheme() == QLatin1String("mailto")) {
+    if (url.scheme() == "mailto"_L1) {
 #if QT_CONFIG(dbus)
         if (checkNeedPortalSupport()) {
             QDBusError error = xdgDesktopPortalSendEmail(url);
diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp
index 2465c8733d..39ea597de5 100644
--- a/src/gui/platform/unix/qgenericunixthemes.cpp
+++ b/src/gui/platform/unix/qgenericunixthemes.cpp
@@ -78,6 +78,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_DECLARE_LOGGING_CATEGORY(qLcTray)
 
 ResourceHelper::ResourceHelper()
@@ -173,7 +175,7 @@ QStringList QGenericUnixTheme::xdgIconThemePaths()
 {
     QStringList paths;
     // Add home directory first in search path
-    const QFileInfo homeIconDir(QDir::homePath() + QLatin1String("/.icons"));
+    const QFileInfo homeIconDir(QDir::homePath() + "/.icons"_L1);
     if (homeIconDir.isDir())
         paths.prepend(homeIconDir.absoluteFilePath());
 
@@ -274,8 +276,8 @@ public:
     static QString kdeGlobals(const QString &kdeDir, int kdeVersion)
     {
         if (kdeVersion > 4)
-            return kdeDir + QLatin1String("/kdeglobals");
-        return kdeDir + QLatin1String("/share/config/kdeglobals");
+            return kdeDir + "/kdeglobals"_L1;
+        return kdeDir + "/share/config/kdeglobals"_L1;
     }
 
     void refresh();
@@ -350,11 +352,11 @@ void QKdeThemePrivate::refresh()
     const QVariant toolbarStyleValue = readKdeSetting(QStringLiteral("Toolbar style/ToolButtonStyle"), kdeDirs, kdeVersion, kdeSettings);
     if (toolbarStyleValue.isValid()) {
         const QString toolBarStyle = toolbarStyleValue.toString();
-        if (toolBarStyle == QLatin1String("TextBesideIcon"))
+        if (toolBarStyle == "TextBesideIcon"_L1)
             toolButtonStyle =  Qt::ToolButtonTextBesideIcon;
-        else if (toolBarStyle == QLatin1String("TextOnly"))
+        else if (toolBarStyle == "TextOnly"_L1)
             toolButtonStyle = Qt::ToolButtonTextOnly;
-        else if (toolBarStyle == QLatin1String("TextUnderIcon"))
+        else if (toolBarStyle == "TextUnderIcon"_L1)
             toolButtonStyle = Qt::ToolButtonTextUnderIcon;
     }
 
@@ -645,22 +647,22 @@ QPlatformTheme *QKdeTheme::createKdeTheme()
     if (!kdeDirsVar.isEmpty())
         kdeDirs += kdeDirsVar.split(u':', Qt::SkipEmptyParts);
 
-    const QString kdeVersionHomePath = QDir::homePath() + QLatin1String("/.kde") + QLatin1String(kdeVersionBA);
+    const QString kdeVersionHomePath = QDir::homePath() + "/.kde"_L1 + QLatin1String(kdeVersionBA);
     if (QFileInfo(kdeVersionHomePath).isDir())
         kdeDirs += kdeVersionHomePath;
 
-    const QString kdeHomePath = QDir::homePath() + QLatin1String("/.kde");
+    const QString kdeHomePath = QDir::homePath() + "/.kde"_L1;
     if (QFileInfo(kdeHomePath).isDir())
         kdeDirs += kdeHomePath;
 
-    const QString kdeRcPath = QLatin1String("/etc/kde") + QLatin1String(kdeVersionBA) + QLatin1String("rc");
+    const QString kdeRcPath = "/etc/kde"_L1 + QLatin1String(kdeVersionBA) + "rc"_L1;
     if (QFileInfo(kdeRcPath).isReadable()) {
         QSettings kdeSettings(kdeRcPath, QSettings::IniFormat);
         kdeSettings.beginGroup(QStringLiteral("Directories-default"));
         kdeDirs += kdeSettings.value(QStringLiteral("prefixes")).toStringList();
     }
 
-    const QString kdeVersionPrefix = QLatin1String("/etc/kde") + QLatin1String(kdeVersionBA);
+    const QString kdeVersionPrefix = "/etc/kde"_L1 + QLatin1String(kdeVersionBA);
     if (QFileInfo(kdeVersionPrefix).isDir())
         kdeDirs += kdeVersionPrefix;
 
@@ -878,7 +880,7 @@ QStringList QGenericUnixTheme::themeNames()
                 // unknown, but lowercase the name (our standard practice) and
                 // remove any "x-" prefix
                 QString s = QString::fromLatin1(desktopName.toLower());
-                result.push_back(s.startsWith(QLatin1String("x-")) ? s.mid(2) : s);
+                result.push_back(s.startsWith("x-"_L1) ? s.mid(2) : s);
             }
         }
     } // desktopSettingsAware
diff --git a/src/gui/platform/unix/qtx11extras.cpp b/src/gui/platform/unix/qtx11extras.cpp
index 09bcb81bae..73aa21a31c 100644
--- a/src/gui/platform/unix/qtx11extras.cpp
+++ b/src/gui/platform/unix/qtx11extras.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QScreen *findScreenForVirtualDesktop(int virtualDesktopNumber)
 {
     const auto screens = QGuiApplication::screens();
@@ -95,7 +97,7 @@ QX11Info::QX11Info()
  */
 bool QX11Info::isPlatformX11()
 {
-    return QGuiApplication::platformName() == QLatin1String("xcb");
+    return QGuiApplication::platformName() == "xcb"_L1;
 }
 
 /*!