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

Task-number: QTBUG-98434
Change-Id: Ic235b92377203f7a1429ae7fd784c4a1fa893e9f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

10 files changed, 172 insertions, 155 deletions

diff --git a/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp b/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp
index f26079b041..dbfc04e6b1 100644
--- a/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp
+++ b/src/plugins/networkinformation/glib/qglibnetworkinformationbackend.cpp
@@ -45,6 +45,9 @@
 #include <gio/gio.h>
 
 QT_BEGIN_NAMESPACE
+
+using namespace Qt::StringLiterals;
+
 Q_DECLARE_LOGGING_CATEGORY(lcNetInfoGlib)
 Q_LOGGING_CATEGORY(lcNetInfoGlib, "qt.network.info.glib");
 
@@ -141,7 +144,7 @@ QGlibNetworkInformationBackend::~QGlibNetworkInformationBackend()
 
 bool QGlibNetworkInformationBackend::isValid() const
 {
-    return G_OBJECT_TYPE_NAME(networkMonitor) != QLatin1String("GNetworkMonitorBase");
+    return G_OBJECT_TYPE_NAME(networkMonitor) != "GNetworkMonitorBase"_L1;
 }
 
 void QGlibNetworkInformationBackend::updateInformation(QGlibNetworkInformationBackend *backend)
diff --git a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
index f8fd100a7e..74d89d8f5d 100644
--- a/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
+++ b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 using namespace Qt::StringLiterals;
 
 QNetworkManagerInterfaceBase::QNetworkManagerInterfaceBase(QObject *parent)
-    : QDBusAbstractInterface(QLatin1String(NM_DBUS_SERVICE), QLatin1String(NM_DBUS_PATH),
+    : QDBusAbstractInterface(NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1,
                              NM_DBUS_INTERFACE, QDBusConnection::systemBus(), parent)
 {
 }
@@ -81,29 +81,27 @@ QNetworkManagerInterface::QNetworkManagerInterface(QObject *parent)
         return;
 
     PropertiesDBusInterface managerPropertiesInterface(
-            QLatin1String(NM_DBUS_SERVICE), QLatin1String(NM_DBUS_PATH), DBUS_PROPERTIES_INTERFACE,
+            NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1, DBUS_PROPERTIES_INTERFACE,
             QDBusConnection::systemBus());
     QList<QVariant> argumentList;
-    argumentList << QLatin1String(NM_DBUS_INTERFACE);
+    argumentList << NM_DBUS_INTERFACE ""_L1;
     QDBusPendingReply<QVariantMap> propsReply = managerPropertiesInterface.callWithArgumentList(
-            QDBus::Block, QLatin1String("GetAll"), argumentList);
+            QDBus::Block, "GetAll"_L1, argumentList);
     if (!propsReply.isError()) {
         propertyMap = propsReply.value();
     } else {
         qWarning() << "propsReply" << propsReply.error().message();
     }
 
-    QDBusConnection::systemBus().connect(
-            QLatin1String(NM_DBUS_SERVICE), QLatin1String(NM_DBUS_PATH),
-            QLatin1String(DBUS_PROPERTIES_INTERFACE), QLatin1String("PropertiesChanged"), this,
+    QDBusConnection::systemBus().connect(NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1,
+            DBUS_PROPERTIES_INTERFACE""_L1, "PropertiesChanged"_L1, this,
             SLOT(setProperties(QString, QMap<QString, QVariant>, QList<QString>)));
 }
 
 QNetworkManagerInterface::~QNetworkManagerInterface()
 {
-    QDBusConnection::systemBus().disconnect(
-            QLatin1String(NM_DBUS_SERVICE), QLatin1String(NM_DBUS_PATH),
-            QLatin1String(DBUS_PROPERTIES_INTERFACE), QLatin1String("PropertiesChanged"), this,
+    QDBusConnection::systemBus().disconnect(NM_DBUS_SERVICE ""_L1, NM_DBUS_PATH ""_L1,
+            DBUS_PROPERTIES_INTERFACE ""_L1, "PropertiesChanged"_L1, this,
             SLOT(setProperties(QString, QMap<QString, QVariant>, QList<QString>)));
 }
 
@@ -202,17 +200,17 @@ void QNetworkManagerInterface::setProperties(const QString &interfaceName,
         }
 
         if (valueChanged) {
-            if (i.key() == QLatin1String("State")) {
+            if (i.key() == "State"_L1) {
                 quint32 state = i.value().toUInt();
                 Q_EMIT stateChanged(static_cast<NMState>(state));
-            } else if (i.key() == QLatin1String("Connectivity")) {
+            } else if (i.key() == "Connectivity"_L1) {
                 quint32 state = i.value().toUInt();
                 Q_EMIT connectivityChanged(static_cast<NMConnectivityState>(state));
-            } else if (i.key() == QLatin1String("PrimaryConnection")) {
+            } else if (i.key() == "PrimaryConnection"_L1) {
                 const QDBusObjectPath devicePath = i->value<QDBusObjectPath>();
                 Q_EMIT deviceTypeChanged(extractDeviceType(devicePath));
                 Q_EMIT meteredChanged(extractDeviceMetered(devicePath));
-            } else if (i.key() == QLatin1String("Metered")) {
+            } else if (i.key() == "Metered"_L1) {
                 Q_EMIT meteredChanged(static_cast<NMMetered>(i->toUInt()));
             }
         }
diff --git a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
index a483c92bd2..30797e5a29 100644
--- a/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
+++ b/src/plugins/tls/openssl/qsslsocket_openssl_symbols.cpp
@@ -81,6 +81,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*
     Note to maintainer:
     -------------------
@@ -628,12 +630,12 @@ static QStringList libraryPathList()
 #  else
     paths = QString::fromLatin1(qgetenv("LD_LIBRARY_PATH")).split(u':', Qt::SkipEmptyParts);
 #  endif
-    paths << QLatin1String("/lib") << QLatin1String("/usr/lib") << QLatin1String("/usr/local/lib");
-    paths << QLatin1String("/lib64") << QLatin1String("/usr/lib64") << QLatin1String("/usr/local/lib64");
-    paths << QLatin1String("/lib32") << QLatin1String("/usr/lib32") << QLatin1String("/usr/local/lib32");
+    paths << "/lib"_L1 << "/usr/lib"_L1 << "/usr/local/lib"_L1;
+    paths << "/lib64"_L1 << "/usr/lib64"_L1 << "/usr/local/lib64"_L1;
+    paths << "/lib32"_L1 << "/usr/lib32"_L1 << "/usr/local/lib32"_L1;
 
 #if defined(Q_OS_ANDROID)
-    paths << QLatin1String("/system/lib");
+    paths << "/system/lib"_L1;
 #elif defined(Q_OS_LINUX)
     // discover paths of already loaded libraries
     QDuplicateTracker<QString> loadedPaths;
@@ -665,12 +667,12 @@ static QStringList findAllLibs(QLatin1String filter)
 
 static QStringList findAllLibSsl()
 {
-    return findAllLibs(QLatin1String("libssl.*"));
+    return findAllLibs("libssl.*"_L1);
 }
 
 static QStringList findAllLibCrypto()
 {
-    return findAllLibs(QLatin1String("libcrypto.*"));
+    return findAllLibs("libcrypto.*"_L1);
 }
 # endif
 
@@ -721,8 +723,8 @@ static LoadedOpenSsl loadOpenSsl()
 #define QT_SSL_SUFFIX
 #endif
 
-    tryToLoadOpenSslWin32Library(QLatin1String("libssl-" QT_OPENSSL_VERSION QT_SSL_SUFFIX),
-                                 QLatin1String("libcrypto-" QT_OPENSSL_VERSION QT_SSL_SUFFIX), result);
+    tryToLoadOpenSslWin32Library("libssl-" QT_OPENSSL_VERSION QT_SSL_SUFFIX ""_L1,
+                                 "libcrypto-" QT_OPENSSL_VERSION QT_SSL_SUFFIX ""_L1, result);
 
 #undef QT_SSL_SUFFIX
     return result;
@@ -779,8 +781,8 @@ static LoadedOpenSsl loadOpenSsl()
 #endif
 #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
+    libssl->setFileNameAndVersion("ssl"_L1, SHLIB_VERSION_NUMBER ""_L1);
+    libcrypto->setFileNameAndVersion("crypto"_L1, SHLIB_VERSION_NUMBER ""_L1);
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
         return result;
@@ -808,11 +810,11 @@ static LoadedOpenSsl loadOpenSsl()
 
     static QString suffix = QString::fromLatin1(openSSLSuffix("_1_1"));
 
-    libssl->setFileNameAndVersion(QLatin1String("ssl") + suffix, -1);
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto") + suffix, -1);
+    libssl->setFileNameAndVersion("ssl"_L1 + suffix, -1);
+    libcrypto->setFileNameAndVersion("crypto"_L1 + suffix, -1);
 # else
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
+    libssl->setFileNameAndVersion("ssl"_L1, -1);
+    libcrypto->setFileNameAndVersion("crypto"_L1, -1);
 # endif
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.0 and libcrypto.so.0 found
diff --git a/src/plugins/tls/openssl/qtls_openssl.cpp b/src/plugins/tls/openssl/qtls_openssl.cpp
index 189730a594..f022ebcd6d 100644
--- a/src/plugins/tls/openssl/qtls_openssl.cpp
+++ b/src/plugins/tls/openssl/qtls_openssl.cpp
@@ -60,6 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace  {
 
 QSsl::AlertLevel tlsAlertLevel(int value)
@@ -85,7 +87,7 @@ QString tlsAlertDescription(int value)
 {
     QString description = QLatin1String(q_SSL_alert_desc_string_long(value));
     if (!description.size())
-        description = QLatin1String("no description provided");
+        description = "no description provided"_L1;
     return description;
 }
 
@@ -822,7 +824,7 @@ void TlsCryptographOpenSSL::continueHandshake()
         debugLineClientRandom.append(masterKey.toHex().toUpper());
         debugLineClientRandom.append("\n");
 
-        QString sslKeyFile = QDir::tempPath() + QLatin1String("/qt-ssl-keys");
+        QString sslKeyFile = QDir::tempPath() + "/qt-ssl-keys"_L1;
         QFile file(sslKeyFile);
         if (!file.open(QIODevice::Append))
             qCWarning(lcTlsBackend) << "could not open file" << sslKeyFile << "for appending";
diff --git a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
index 6a25163162..6693cc8142 100644
--- a/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
+++ b/src/plugins/tls/openssl/qtlsbackend_openssl.cpp
@@ -65,6 +65,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_LOGGING_CATEGORY(lcTlsBackend, "qt.tlsbackend.ossl");
 
 Q_GLOBAL_STATIC(QRecursiveMutex, qt_opensslInitMutex)
@@ -80,9 +82,9 @@ static void q_loadCiphersForConnection(SSL *connection, QList<QSslCipher> &ciphe
             const auto ciph = QTlsBackendOpenSSL::qt_OpenSSL_cipher_to_QSslCipher(cipher);
             if (!ciph.isNull()) {
                 // Unconditionally exclude ADH and AECDH ciphers since they offer no MITM protection
-                if (!ciph.name().toLower().startsWith(QLatin1String("adh")) &&
-                    !ciph.name().toLower().startsWith(QLatin1String("exp-adh")) &&
-                    !ciph.name().toLower().startsWith(QLatin1String("aecdh"))) {
+                if (!ciph.name().toLower().startsWith("adh"_L1) &&
+                    !ciph.name().toLower().startsWith("exp-adh"_L1) &&
+                    !ciph.name().toLower().startsWith("aecdh"_L1)) {
                     ciphers << ciph;
 
                     if (ciph.usedBits() >= 128)
@@ -104,7 +106,7 @@ QString QTlsBackendOpenSSL::getErrorsFromOpenSsl()
     unsigned long errNum;
     while ((errNum = q_ERR_get_error())) {
         if (!errorString.isEmpty())
-            errorString.append(QLatin1String(", "));
+            errorString.append(", "_L1);
         q_ERR_error_string_n(errNum, buf, sizeof buf);
         errorString.append(QString::fromLatin1(buf)); // error is ascii according to man ERR_error_string
     }
@@ -226,7 +228,7 @@ void QTlsBackendOpenSSL::ensureCiphersAndCertsLoaded() const
     // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there)
     const QList<QByteArray> dirs = QSslSocketPrivate::unixRootCertDirectories();
     QStringList symLinkFilter;
-    symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]");
+    symLinkFilter << "[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]"_L1;
     for (const auto &dir : dirs) {
         QDirIterator iterator(QLatin1String(dir), symLinkFilter, QDir::Files);
         if (iterator.hasNext()) {
diff --git a/src/plugins/tls/openssl/qx509_openssl.cpp b/src/plugins/tls/openssl/qx509_openssl.cpp
index b7c2e7cff4..b614014a0f 100644
--- a/src/plugins/tls/openssl/qx509_openssl.cpp
+++ b/src/plugins/tls/openssl/qx509_openssl.cpp
@@ -57,6 +57,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace QTlsPrivate {
 
 namespace {
@@ -305,9 +307,9 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext)
             if (!basic)
                 return {};
             QVariantMap result;
-            result[QLatin1String("ca")] = basic->ca ? true : false;
+            result["ca"_L1] = basic->ca ? true : false;
             if (basic->pathlen)
-                result[QLatin1String("pathLenConstraint")] = (qlonglong)q_ASN1_INTEGER_get(basic->pathlen);
+                result["pathLenConstraint"_L1] = (qlonglong)q_ASN1_INTEGER_get(basic->pathlen);
 
             q_BASIC_CONSTRAINTS_free(basic);
             return result;
@@ -364,7 +366,7 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext)
             if (auth_key->keyid) {
                 QByteArray keyid(reinterpret_cast<const char *>(auth_key->keyid->data),
                                  auth_key->keyid->length);
-                result[QLatin1String("keyid")] = keyid.toHex();
+                result["keyid"_L1] = keyid.toHex();
             }
 
             // issuer
@@ -372,7 +374,7 @@ QVariant x509ExtensionToValue(X509_EXTENSION *ext)
 
             // serial
             if (auth_key->serial)
-                result[QLatin1String("serial")] = (qlonglong)q_ASN1_INTEGER_get(auth_key->serial);
+                result["serial"_L1] = (qlonglong)q_ASN1_INTEGER_get(auth_key->serial);
 
             q_AUTHORITY_KEYID_free(auth_key);
             return result;
diff --git a/src/plugins/tls/schannel/qtls_schannel.cpp b/src/plugins/tls/schannel/qtls_schannel.cpp
index eb102c2553..1a2fdfe7b3 100644
--- a/src/plugins/tls/schannel/qtls_schannel.cpp
+++ b/src/plugins/tls/schannel/qtls_schannel.cpp
@@ -161,6 +161,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_LOGGING_CATEGORY(lcTlsBackendSchannel, "qt.tlsbackend.schannel");
 
 // Defined in qsslsocket_qt.cpp.
@@ -213,7 +215,7 @@ long QSchannelBackend::tlsLibraryVersionNumber() const
 QString QSchannelBackend::tlsLibraryVersionString() const
 {
     const auto os = QOperatingSystemVersion::current();
-    return QLatin1String("Secure Channel, %1 %2.%3.%4")
+    return "Secure Channel, %1 %2.%3.%4"_L1
             .arg(os.name(),
                  QString::number(os.majorVersion()),
                  QString::number(os.minorVersion()),
@@ -227,7 +229,7 @@ long QSchannelBackend::tlsLibraryBuildVersionNumber() const
 
 QString QSchannelBackend::tlsLibraryBuildVersionString() const
 {
-    return QLatin1String("Secure Channel (NTDDI: 0x%1)")
+    return "Secure Channel (NTDDI: 0x%1)"_L1
             .arg(QString::number(NTDDI_VERSION, 16).toUpper());
 }
 
@@ -571,11 +573,11 @@ bool isCertificateAuthority(const QList<QSslCertificateExtension> &extensions)
 {
     auto it = std::find_if(extensions.cbegin(), extensions.cend(),
                            [](const QSslCertificateExtension &extension) {
-                               return extension.name() == QLatin1String("basicConstraints");
+                               return extension.name() == "basicConstraints"_L1;
                            });
     if (it != extensions.cend()) {
         QVariantMap basicConstraints = it->value().toMap();
-        return basicConstraints.value(QLatin1String("ca"), false).toBool();
+        return basicConstraints.value("ca"_L1, false).toBool();
     }
     return false;
 }
@@ -2245,7 +2247,7 @@ bool TlsCryptographSchannel::verifyCertContext(CERT_CONTEXT *certContext)
         if (element->TrustStatus.dwErrorStatus & CERT_TRUST_INVALID_BASIC_CONSTRAINTS) {
             auto it = std::find_if(extensions.cbegin(), extensions.cend(),
                                    [](const QSslCertificateExtension &extension) {
-                                       return extension.name() == QLatin1String("basicConstraints");
+                                       return extension.name() == "basicConstraints"_L1;
                                    });
             if (it != extensions.cend()) {
                 // @Note: This is actually one of two errors:
@@ -2253,7 +2255,7 @@ bool TlsCryptographSchannel::verifyCertContext(CERT_CONTEXT *certContext)
                 // or the chain path length has been exceeded."
                 QVariantMap basicConstraints = it->value().toMap();
                 QSslError error;
-                if (i > 0 && !basicConstraints.value(QLatin1String("ca"), false).toBool())
+                if (i > 0 && !basicConstraints.value("ca"_L1, false).toBool())
                     error = QSslError(QSslError::InvalidPurpose, certificate);
                 else
                     error = QSslError(QSslError::PathLengthExceeded, certificate);
diff --git a/src/plugins/tls/securetransport/qtls_st.cpp b/src/plugins/tls/securetransport/qtls_st.cpp
index 75472888e5..60127ca885 100644
--- a/src/plugins/tls/securetransport/qtls_st.cpp
+++ b/src/plugins/tls/securetransport/qtls_st.cpp
@@ -76,6 +76,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // Defined in qsslsocket_qt.cpp.
 QByteArray _q_makePkcs12(const QList<QSslCertificate> &certs, const QSslKey &key,
                          const QString &passPhrase);
@@ -120,7 +122,7 @@ EphemeralSecKeychain::EphemeralSecKeychain()
     const auto uuidAsString = QLatin1String(uuidAsByteArray.data(), uuidAsByteArray.size()).mid(1, uuidAsByteArray.size() - 2);
 
     const QString keychainName
-            = QDir::tempPath() + QDir::separator() + uuidAsString + QLatin1String(".keychain");
+            = QDir::tempPath() + QDir::separator() + uuidAsString + ".keychain"_L1;
     // SecKeychainCreate, pathName parameter:
     //
     // "A constant character string representing the POSIX path indicating where
@@ -575,107 +577,107 @@ void TlsCryptographSecureTransport::transmit()
 
 SSLCipherSuite TlsCryptographSecureTransport::SSLCipherSuite_from_QSslCipher(const QSslCipher &ciph)
 {
-    if (ciph.name() == QLatin1String("AES128-SHA"))
+    if (ciph.name() == "AES128-SHA"_L1)
         return TLS_RSA_WITH_AES_128_CBC_SHA;
-    if (ciph.name() == QLatin1String("DHE-RSA-AES128-SHA"))
+    if (ciph.name() == "DHE-RSA-AES128-SHA"_L1)
         return TLS_DHE_RSA_WITH_AES_128_CBC_SHA;
-    if (ciph.name() == QLatin1String("AES256-SHA"))
+    if (ciph.name() == "AES256-SHA"_L1)
         return TLS_RSA_WITH_AES_256_CBC_SHA;
-    if (ciph.name() == QLatin1String("DHE-RSA-AES256-SHA"))
+    if (ciph.name() == "DHE-RSA-AES256-SHA"_L1)
         return TLS_DHE_RSA_WITH_AES_256_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-NULL-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-NULL-SHA"_L1)
         return TLS_ECDH_ECDSA_WITH_NULL_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-RC4-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-RC4-SHA"_L1)
         return TLS_ECDH_ECDSA_WITH_RC4_128_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-DES-CBC3-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-DES-CBC3-SHA"_L1)
         return TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES128-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-AES128-SHA"_L1)
         return TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES256-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-AES256-SHA"_L1)
         return TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-RC4-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-RC4-SHA"_L1)
         return TLS_ECDHE_ECDSA_WITH_RC4_128_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-DES-CBC3-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-DES-CBC3-SHA"_L1)
         return TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES128-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-AES128-SHA"_L1)
         return TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES256-SHA"))
+    if (ciph.name() == "ECDH-ECDSA-AES256-SHA"_L1)
         return TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-NULL-SHA"))
+    if (ciph.name() == "ECDH-RSA-NULL-SHA"_L1)
         return TLS_ECDH_RSA_WITH_NULL_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-RC4-SHA"))
+    if (ciph.name() == "ECDH-RSA-RC4-SHA"_L1)
         return TLS_ECDH_RSA_WITH_RC4_128_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-DES-CBC3-SHA"))
+    if (ciph.name() == "ECDH-RSA-DES-CBC3-SHA"_L1)
         return TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-AES128-SHA"))
+    if (ciph.name() == "ECDH-RSA-AES128-SHA"_L1)
         return TLS_ECDH_RSA_WITH_AES_128_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-AES256-SHA"))
+    if (ciph.name() == "ECDH-RSA-AES256-SHA"_L1)
         return TLS_ECDH_RSA_WITH_AES_256_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-RC4-SHA"))
+    if (ciph.name() == "ECDH-RSA-RC4-SHA"_L1)
         return TLS_ECDHE_RSA_WITH_RC4_128_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-DES-CBC3-SHA"))
+    if (ciph.name() == "ECDH-RSA-DES-CBC3-SHA"_L1)
         return TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-AES128-SHA"))
+    if (ciph.name() == "ECDH-RSA-AES128-SHA"_L1)
         return TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA;
-    if (ciph.name() == QLatin1String("ECDH-RSA-AES256-SHA"))
+    if (ciph.name() == "ECDH-RSA-AES256-SHA"_L1)
         return TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA;
-    if (ciph.name() == QLatin1String("DES-CBC3-SHA"))
+    if (ciph.name() == "DES-CBC3-SHA"_L1)
         return TLS_RSA_WITH_3DES_EDE_CBC_SHA;
-    if (ciph.name() == QLatin1String("AES128-SHA256"))
+    if (ciph.name() == "AES128-SHA256"_L1)
         return TLS_RSA_WITH_AES_128_CBC_SHA256;
-    if (ciph.name() == QLatin1String("AES256-SHA256"))
+    if (ciph.name() == "AES256-SHA256"_L1)
         return TLS_RSA_WITH_AES_256_CBC_SHA256;
-    if (ciph.name() == QLatin1String("DHE-RSA-DES-CBC3-SHA"))
+    if (ciph.name() == "DHE-RSA-DES-CBC3-SHA"_L1)
         return TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA;
-    if (ciph.name() == QLatin1String("DHE-RSA-AES128-SHA256"))
+    if (ciph.name() == "DHE-RSA-AES128-SHA256"_L1)
         return TLS_DHE_RSA_WITH_AES_128_CBC_SHA256;
-    if (ciph.name() == QLatin1String("DHE-RSA-AES256-SHA256"))
+    if (ciph.name() == "DHE-RSA-AES256-SHA256"_L1)
         return TLS_DHE_RSA_WITH_AES_256_CBC_SHA256;
-    if (ciph.name() == QLatin1String("AES256-GCM-SHA384"))
+    if (ciph.name() == "AES256-GCM-SHA384"_L1)
         return TLS_RSA_WITH_AES_256_GCM_SHA384;
-    if (ciph.name() == QLatin1String("ECDHE-ECDSA-AES128-SHA256"))
+    if (ciph.name() == "ECDHE-ECDSA-AES128-SHA256"_L1)
         return TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256;
-    if (ciph.name() == QLatin1String("ECDHE-ECDSA-AES256-SHA384"))
+    if (ciph.name() == "ECDHE-ECDSA-AES256-SHA384"_L1)
         return TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES128-SHA256"))
+    if (ciph.name() == "ECDH-ECDSA-AES128-SHA256"_L1)
         return TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES256-SHA384"))
+    if (ciph.name() == "ECDH-ECDSA-AES256-SHA384"_L1)
         return TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384;
-    if (ciph.name() == QLatin1String("ECDHE-RSA-AES128-SHA256"))
+    if (ciph.name() == "ECDHE-RSA-AES128-SHA256"_L1)
         return TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256;
-    if (ciph.name() == QLatin1String("ECDHE-RSA-AES256-SHA384"))
+    if (ciph.name() == "ECDHE-RSA-AES256-SHA384"_L1)
         return TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384;
-    if (ciph.name() == QLatin1String("ECDHE-RSA-AES256-SHA384"))
+    if (ciph.name() == "ECDHE-RSA-AES256-SHA384"_L1)
         return TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256;
-    if (ciph.name() == QLatin1String("ECDHE-RSA-AES256-GCM-SHA384"))
+    if (ciph.name() == "ECDHE-RSA-AES256-GCM-SHA384"_L1)
         return TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384;
-    if (ciph.name() == QLatin1String("AES128-GCM-SHA256"))
+    if (ciph.name() == "AES128-GCM-SHA256"_L1)
         return TLS_AES_128_GCM_SHA256;
-    if (ciph.name() == QLatin1String("AES256-GCM-SHA384"))
+    if (ciph.name() == "AES256-GCM-SHA384"_L1)
         return TLS_AES_256_GCM_SHA384;
-    if (ciph.name() == QLatin1String("CHACHA20-POLY1305-SHA256"))
+    if (ciph.name() == "CHACHA20-POLY1305-SHA256"_L1)
         return TLS_CHACHA20_POLY1305_SHA256;
-    if (ciph.name() == QLatin1String("AES128-CCM-SHA256"))
+    if (ciph.name() == "AES128-CCM-SHA256"_L1)
         return TLS_AES_128_CCM_SHA256;
-    if (ciph.name() == QLatin1String("AES128-CCM8-SHA256"))
+    if (ciph.name() == "AES128-CCM8-SHA256"_L1)
         return TLS_AES_128_CCM_8_SHA256;
-    if (ciph.name() == QLatin1String("ECDHE-ECDSA-AES128-GCM-SHA256"))
+    if (ciph.name() == "ECDHE-ECDSA-AES128-GCM-SHA256"_L1)
         return TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256;
-    if (ciph.name() == QLatin1String("ECDHE-ECDSA-AES256-GCM-SHA384"))
+    if (ciph.name() == "ECDHE-ECDSA-AES256-GCM-SHA384"_L1)
         return TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES128-GCM-SHA256"))
+    if (ciph.name() == "ECDH-ECDSA-AES128-GCM-SHA256"_L1)
         return TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256;
-    if (ciph.name() == QLatin1String("ECDH-ECDSA-AES256-GCM-SHA384"))
+    if (ciph.name() == "ECDH-ECDSA-AES256-GCM-SHA384"_L1)
         return TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384;
-    if (ciph.name() == QLatin1String("ECDHE-RSA-AES128-GCM-SHA256"))
+    if (ciph.name() == "ECDHE-RSA-AES128-GCM-SHA256"_L1)
         return TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256;
-    if (ciph.name() == QLatin1String("ECDH-RSA-AES128-GCM-SHA256"))
+    if (ciph.name() == "ECDH-RSA-AES128-GCM-SHA256"_L1)
         return TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256;
-    if (ciph.name() == QLatin1String("ECDH-RSA-AES256-GCM-SHA384"))
+    if (ciph.name() == "ECDH-RSA-AES256-GCM-SHA384"_L1)
         return TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384;
-    if (ciph.name() == QLatin1String("ECDHE-RSA-CHACHA20-POLY1305-SHA256"))
+    if (ciph.name() == "ECDHE-RSA-CHACHA20-POLY1305-SHA256"_L1)
         return TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256;
-    if (ciph.name() == QLatin1String("ECDHE-ECDSA-CHACHA20-POLY1305-SHA256"))
+    if (ciph.name() == "ECDHE-ECDSA-CHACHA20-POLY1305-SHA256"_L1)
         return TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256;
 
     return 0;
diff --git a/src/plugins/tls/securetransport/qtlsbackend_st.cpp b/src/plugins/tls/securetransport/qtlsbackend_st.cpp
index a0532b49df..ce7accdb78 100644
--- a/src/plugins/tls/securetransport/qtlsbackend_st.cpp
+++ b/src/plugins/tls/securetransport/qtlsbackend_st.cpp
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 Q_GLOBAL_STATIC(QRecursiveMutex, qt_securetransport_mutex)
 
 Q_LOGGING_CATEGORY(lcSecureTransport, "qt.tlsbackend.securetransport");
@@ -64,98 +66,98 @@ QSslCipher QSslCipher_from_SSLCipherSuite(SSLCipherSuite cipher)
     // Sorted as in CipherSuite.h (and groupped by their RFC)
     // TLS addenda using AES, per RFC 3268
     case TLS_RSA_WITH_AES_128_CBC_SHA:
-        name = QLatin1String("AES128-SHA");
+        name = "AES128-SHA"_L1;
         break;
     case TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        name = QLatin1String("DHE-RSA-AES128-SHA");
+        name = "DHE-RSA-AES128-SHA"_L1;
         break;
     case TLS_RSA_WITH_AES_256_CBC_SHA:
-        name = QLatin1String("AES256-SHA");
+        name = "AES256-SHA"_L1;
         break;
     case TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        name = QLatin1String("DHE-RSA-AES256-SHA");
+        name = "DHE-RSA-AES256-SHA"_L1;
         break;
 
     // ECDSA addenda, RFC 4492
     case TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        name = QLatin1String("ECDH-ECDSA-NULL-SHA");
+        name = "ECDH-ECDSA-NULL-SHA"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-        name = QLatin1String("ECDH-ECDSA-RC4-SHA");
+        name = "ECDH-ECDSA-RC4-SHA"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        name = QLatin1String("ECDH-ECDSA-DES-CBC3-SHA");
+        name = "ECDH-ECDSA-DES-CBC3-SHA"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        name = QLatin1String("ECDH-ECDSA-AES128-SHA");
+        name = "ECDH-ECDSA-AES128-SHA"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        name = QLatin1String("ECDH-ECDSA-AES256-SHA");
+        name = "ECDH-ECDSA-AES256-SHA"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        name = QLatin1String("ECDHE-ECDSA-NULL-SHA");
+        name = "ECDHE-ECDSA-NULL-SHA"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        name = QLatin1String("ECDHE-ECDSA-RC4-SHA");
+        name = "ECDHE-ECDSA-RC4-SHA"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        name = QLatin1String("ECDHE-ECDSA-DES-CBC3-SHA");
+        name = "ECDHE-ECDSA-DES-CBC3-SHA"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        name = QLatin1String("ECDHE-ECDSA-AES128-SHA");
+        name = "ECDHE-ECDSA-AES128-SHA"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        name = QLatin1String("ECDHE-ECDSA-AES256-SHA");
+        name = "ECDHE-ECDSA-AES256-SHA"_L1;
         break;
     case TLS_ECDH_RSA_WITH_NULL_SHA:
-        name = QLatin1String("ECDH-RSA-NULL-SHA");
+        name = "ECDH-RSA-NULL-SHA"_L1;
         break;
     case TLS_ECDH_RSA_WITH_RC4_128_SHA:
-        name = QLatin1String("ECDH-RSA-RC4-SHA");
+        name = "ECDH-RSA-RC4-SHA"_L1;
         break;
     case TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
-        name = QLatin1String("ECDH-RSA-DES-CBC3-SHA");
+        name = "ECDH-RSA-DES-CBC3-SHA"_L1;
         break;
     case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
-        name = QLatin1String("ECDH-RSA-AES128-SHA");
+        name = "ECDH-RSA-AES128-SHA"_L1;
         break;
     case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
-        name = QLatin1String("ECDH-RSA-AES256-SHA");
+        name = "ECDH-RSA-AES256-SHA"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_NULL_SHA:
-        name = QLatin1String("ECDHE-RSA-NULL-SHA");
+        name = "ECDHE-RSA-NULL-SHA"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        name = QLatin1String("ECDHE-RSA-RC4-SHA");
+        name = "ECDHE-RSA-RC4-SHA"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        name = QLatin1String("ECDHE-RSA-DES-CBC3-SHA");
+        name = "ECDHE-RSA-DES-CBC3-SHA"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        name = QLatin1String("ECDHE-RSA-AES128-SHA");
+        name = "ECDHE-RSA-AES128-SHA"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        name = QLatin1String("ECDHE-RSA-AES256-SHA");
+        name = "ECDHE-RSA-AES256-SHA"_L1;
         break;
 
     // TLS 1.2 addenda, RFC 5246
     case TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-        name = QLatin1String("DES-CBC3-SHA");
+        name = "DES-CBC3-SHA"_L1;
         break;
     case TLS_RSA_WITH_AES_128_CBC_SHA256:
-        name = QLatin1String("AES128-SHA256");
+        name = "AES128-SHA256"_L1;
         break;
     case TLS_RSA_WITH_AES_256_CBC_SHA256:
-        name = QLatin1String("AES256-SHA256");
+        name = "AES256-SHA256"_L1;
         break;
     case TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        name = QLatin1String("DHE-RSA-DES-CBC3-SHA");
+        name = "DHE-RSA-DES-CBC3-SHA"_L1;
         break;
     case TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        name = QLatin1String("DHE-RSA-AES128-SHA256");
+        name = "DHE-RSA-AES128-SHA256"_L1;
         break;
     case TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        name = QLatin1String("DHE-RSA-AES256-SHA256");
+        name = "DHE-RSA-AES256-SHA256"_L1;
         break;
 
     // Addendum from RFC 4279, TLS PSK
@@ -166,7 +168,7 @@ QSslCipher QSslCipher_from_SSLCipherSuite(SSLCipherSuite cipher)
 
     // Addenda from rfc 5288 AES Galois Counter Mode (CGM) Cipher Suites for TLS
     case TLS_RSA_WITH_AES_256_GCM_SHA384:
-        name = QLatin1String("AES256-GCM-SHA384");
+        name = "AES256-GCM-SHA384"_L1;
         break;
 
     // RFC 5487 - PSK with SHA-256/384 and AES GCM
@@ -174,90 +176,90 @@ QSslCipher QSslCipher_from_SSLCipherSuite(SSLCipherSuite cipher)
 
     // Addenda from rfc 5289 Elliptic Curve Cipher Suites with HMAC SHA-256/384
     case TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        name = QLatin1String("ECDHE-ECDSA-AES128-SHA256");
+        name = "ECDHE-ECDSA-AES128-SHA256"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        name = QLatin1String("ECDHE-ECDSA-AES256-SHA384");
+        name = "ECDHE-ECDSA-AES256-SHA384"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        name = QLatin1String("ECDH-ECDSA-AES128-SHA256");
+        name = "ECDH-ECDSA-AES128-SHA256"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        name = QLatin1String("ECDH-ECDSA-AES256-SHA384");
+        name = "ECDH-ECDSA-AES256-SHA384"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        name = QLatin1String("ECDHE-RSA-AES128-SHA256");
+        name = "ECDHE-RSA-AES128-SHA256"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        name = QLatin1String("ECDHE-RSA-AES256-SHA384");
+        name = "ECDHE-RSA-AES256-SHA384"_L1;
         break;
     case TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        name = QLatin1String("ECDH-RSA-AES128-SHA256");
+        name = "ECDH-RSA-AES128-SHA256"_L1;
         break;
     case TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        name = QLatin1String("ECDH-RSA-AES256-SHA384");
+        name = "ECDH-RSA-AES256-SHA384"_L1;
         break;
 
     // Addenda from rfc 5289 Elliptic Curve Cipher Suites
     // with SHA-256/384 and AES Galois Counter Mode (GCM)
     case TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        name = QLatin1String("ECDHE-RSA-AES256-GCM-SHA384");
+        name = "ECDHE-RSA-AES256-GCM-SHA384"_L1;
         break;
 
     // TLS 1.3 standard cipher suites for ChaCha20+Poly1305.
     // Note: TLS 1.3 ciphersuites do not specify the key exchange
     // algorithm -- they only specify the symmetric ciphers.
     case TLS_AES_128_GCM_SHA256:
-        name = QLatin1String("AES128-GCM-SHA256");
+        name = "AES128-GCM-SHA256"_L1;
         break;
     case TLS_AES_256_GCM_SHA384:
-        name = QLatin1String("AES256-GCM-SHA384");
+        name = "AES256-GCM-SHA384"_L1;
         break;
     case TLS_CHACHA20_POLY1305_SHA256:
-        name = QLatin1String("CHACHA20-POLY1305-SHA256");
+        name = "CHACHA20-POLY1305-SHA256"_L1;
         break;
     case TLS_AES_128_CCM_SHA256:
-        name = QLatin1String("AES128-CCM-SHA256");
+        name = "AES128-CCM-SHA256"_L1;
         break;
     case TLS_AES_128_CCM_8_SHA256:
-        name = QLatin1String("AES128-CCM8-SHA256");
+        name = "AES128-CCM8-SHA256"_L1;
         break;
     // Addenda from rfc 5289  Elliptic Curve Cipher Suites with
     // SHA-256/384 and AES Galois Counter Mode (GCM).
     case TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        name = QLatin1String("ECDHE-ECDSA-AES128-GCM-SHA256");
+        name = "ECDHE-ECDSA-AES128-GCM-SHA256"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        name = QLatin1String("ECDHE-ECDSA-AES256-GCM-SHA384");
+        name = "ECDHE-ECDSA-AES256-GCM-SHA384"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        name = QLatin1String("ECDH-ECDSA-AES128-GCM-SHA256");
+        name = "ECDH-ECDSA-AES128-GCM-SHA256"_L1;
         break;
     case TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        name = QLatin1String("ECDH-ECDSA-AES256-GCM-SHA384");
+        name = "ECDH-ECDSA-AES256-GCM-SHA384"_L1;
         break;
     case TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        name = QLatin1String("ECDHE-RSA-AES128-GCM-SHA256");
+        name = "ECDHE-RSA-AES128-GCM-SHA256"_L1;
         break;
     case TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        name = QLatin1String("ECDH-RSA-AES128-GCM-SHA256");
+        name = "ECDH-RSA-AES128-GCM-SHA256"_L1;
         break;
     case TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        name = QLatin1String("ECDH-RSA-AES256-GCM-SHA384");
+        name = "ECDH-RSA-AES256-GCM-SHA384"_L1;
         break;
     // Addenda from rfc 7905  ChaCha20-Poly1305 Cipher Suites for
     // Transport Layer Security (TLS).
     case TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        name = QLatin1String("ECDHE-RSA-CHACHA20-POLY1305-SHA256");
+        name = "ECDHE-RSA-CHACHA20-POLY1305-SHA256"_L1;
         break;
     case TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        name = QLatin1String("ECDHE-ECDSA-CHACHA20-POLY1305-SHA256");
+        name = "ECDHE-ECDSA-CHACHA20-POLY1305-SHA256"_L1;
         break;
     default:
         return {};
     }
 
-    return QTlsBackend::createCiphersuite(name, QSsl::TlsV1_2, QLatin1String("TLSv1.2"));
+    return QTlsBackend::createCiphersuite(name, QSsl::TlsV1_2, "TLSv1.2"_L1);
 }
 
 } // namespace QTlsPrivate
@@ -266,7 +268,7 @@ bool QSecureTransportBackend::s_loadedCiphersAndCerts = false;
 
 QString QSecureTransportBackend::tlsLibraryVersionString() const
 {
-    return QLatin1String("Secure Transport, ") + QSysInfo::prettyProductName();
+    return "Secure Transport, "_L1 + QSysInfo::prettyProductName();
 }
 
 QString QSecureTransportBackend::tlsLibraryBuildVersionString() const
diff --git a/src/plugins/tls/shared/qx509_generic.cpp b/src/plugins/tls/shared/qx509_generic.cpp
index 5e06c765e1..f92bd1214e 100644
--- a/src/plugins/tls/shared/qx509_generic.cpp
+++ b/src/plugins/tls/shared/qx509_generic.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace QTlsPrivate {
 
 namespace {
@@ -291,7 +293,7 @@ bool X509CertificateGeneric::parse(const QByteArray &data)
                     if (!parseExtension(elem.value(), extension))
                         return false;
 
-                    if (extension.oid == QLatin1String("2.5.29.17")) {
+                    if (extension.oid == "2.5.29.17"_L1) {
                         // subjectAltName
 
                         // Note, parseExtension() returns true for this extensions,