Qt Designer: Remove remaining (deprecated) QLatin1String

Change-Id: I3f345fc366bb4d7a7844acfbf92b736565fc70df Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 7b27f46f27cedf651836002878b35d2afdeb43de) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
author: Friedemann Kleint <Friedemann.Kleint@qt.io> 2023-07-24 12:00:46 +0200
committer: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> 2023-07-25 09:35:44 +0000
commit: 56eaef5121453c8fe106062b23f6467404f211a9 (patch)
tree: e4d1e16bbe65c36ac14e81af8a483466ea68f9e9
parent: 0d34f7667071530f9eaf648942f64b65db78142d (diff)
64 files changed, 628 insertions, 607 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index 69b903804..a6343bf9a 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -57,7 +57,7 @@ static QString buddy(QLabel *label, QDesignerFormEditorInterface *core)
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core->extensionManager(), label);
     if (sheet == nullptr)
         return QString();
-    const int prop_idx = sheet->indexOf(QLatin1String(buddyPropertyC));
+    const int prop_idx = sheet->indexOf(QLatin1StringView(buddyPropertyC));
     if (prop_idx == -1)
         return QString();
     return sheet->property(prop_idx).toString();
@@ -211,7 +211,7 @@ void BuddyEditor::setBackground(QWidget *background)
 static QUndoCommand *createBuddyCommand(QDesignerFormWindowInterface *fw, QLabel *label, QWidget *buddy)
 {
     SetPropertyCommand *command = new SetPropertyCommand(fw);
-    command->init(label, QLatin1String(buddyPropertyC), buddy->objectName());
+    command->init(label, QLatin1StringView(buddyPropertyC), buddy->objectName());
     command->setText(BuddyEditor::tr("Add buddy"));
     return command;
 }
@@ -273,7 +273,7 @@ void BuddyEditor::widgetRemoved(QWidget *widget)
                 qDebug("BuddyConnection::widgetRemoved(): not a label");
             } else {
                 ResetPropertyCommand *command = new ResetPropertyCommand(formWindow());
-                command->init(source, QLatin1String(buddyPropertyC));
+                command->init(source, QLatin1StringView(buddyPropertyC));
                 undoStack()->push(command);
             }
             delete takeConnection(con);
@@ -297,7 +297,7 @@ void BuddyEditor::deleteSelected()
             qDebug("BuddyConnection::deleteSelected(): not a label");
         } else {
             ResetPropertyCommand *command = new ResetPropertyCommand(formWindow());
-            command->init(source, QLatin1String(buddyPropertyC));
+            command->init(source, QLatin1StringView(buddyPropertyC));
             undoStack()->push(command);
         }
         delete takeConnection(con);
diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
index 3af31d47f..c113957dc 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
@@ -25,7 +25,7 @@ static const char *profileExtensionC = "qdp";
 
 static inline QString fileFilter()
 {
-    return qdesigner_internal::DeviceProfileDialog::tr("Device Profiles (*.%1)").arg(QLatin1String(profileExtensionC));
+    return qdesigner_internal::DeviceProfileDialog::tr("Device Profiles (*.%1)").arg(QLatin1StringView(profileExtensionC));
 }
 
 // Populate a combo with a sequence of integers, also set them as data.
diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.cpp b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
index cb047380e..2895436ae 100644
--- a/src/designer/src/components/formeditor/itemview_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
@@ -74,13 +74,13 @@ QStringList ItemViewPropertySheetPrivate::realPropertyNames()
 {
     if (m_realPropertyNames.isEmpty())
         m_realPropertyNames
-            << QLatin1String(visibleProperty)
-            << QLatin1String(cascadingSectionResizesProperty)
-            << QLatin1String(defaultSectionSizeProperty)
-            << QLatin1String(highlightSectionsProperty)
-            << QLatin1String(minimumSectionSizeProperty)
-            << QLatin1String(showSortIndicatorProperty)
-            << QLatin1String(stretchLastSectionProperty);
+            << QLatin1StringView(visibleProperty)
+            << QLatin1StringView(cascadingSectionResizesProperty)
+            << QLatin1StringView(defaultSectionSizeProperty)
+            << QLatin1StringView(highlightSectionsProperty)
+            << QLatin1StringView(minimumSectionSizeProperty)
+            << QLatin1StringView(showSortIndicatorProperty)
+            << QLatin1StringView(stretchLastSectionProperty);
     return m_realPropertyNames;
 }
 
@@ -138,12 +138,12 @@ void ItemViewPropertySheet::initHeaderProperties(QHeaderView *hv, const QString
 {
     QDesignerPropertySheetExtension *headerSheet = d->m_propertySheet.value(hv);
     Q_ASSERT(headerSheet);
-    const QString headerGroupS = QLatin1String(headerGroup);
+    const QString headerGroupS = QLatin1StringView(headerGroup);
     const QStringList &realPropertyNames = d->realPropertyNames();
     for (const QString &realPropertyName : realPropertyNames) {
         const int headerIndex = headerSheet->indexOf(realPropertyName);
         Q_ASSERT(headerIndex != -1);
-        const QVariant defaultValue = realPropertyName == QLatin1String(visibleProperty) ?
+        const QVariant defaultValue = realPropertyName == QLatin1StringView(visibleProperty) ?
                                       QVariant(true) : headerSheet->property(headerIndex);
         const QString fakePropertyName = d->fakePropertyName(prefix, realPropertyName);
         const int fakeIndex = createFakeProperty(fakePropertyName, defaultValue);
@@ -215,7 +215,7 @@ bool ItemViewPropertySheet::reset(int index)
        // Resetting for "visible" might fail and the stored default
        // of the Widget database is "false" due to the widget not being
        // visible at the time it was determined. Reset to "true" manually.
-       if (!resetRC && headerSheet->propertyName(headerIndex) == QLatin1String(visibleProperty)) {
+       if (!resetRC && headerSheet->propertyName(headerIndex) == QLatin1StringView(visibleProperty)) {
            headerSheet->setProperty(headerIndex, QVariant(true));
            headerSheet->setChanged(headerIndex, false);
            return true;
diff --git a/src/designer/src/components/formeditor/layout_propertysheet.cpp b/src/designer/src/components/formeditor/layout_propertysheet.cpp
index e26db101d..d1ead2f58 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/layout_propertysheet.cpp
@@ -78,19 +78,19 @@ static bool isIntegerList(const QString &s)
 static LayoutPropertyType  layoutPropertyType(const QString &name)
 {
     static const QHash<QString, LayoutPropertyType> namePropertyMap = {
-        {QLatin1String(leftMargin), LayoutPropertyLeftMargin},
-        {QLatin1String(topMargin), LayoutPropertyTopMargin},
-        {QLatin1String(rightMargin), LayoutPropertyRightMargin},
-        {QLatin1String(bottomMargin), LayoutPropertyBottomMargin},
-        {QLatin1String(horizontalSpacing), LayoutPropertyHorizontalSpacing},
-        {QLatin1String(verticalSpacing), LayoutPropertyVerticalSpacing},
-        {QLatin1String(spacing), LayoutPropertySpacing},
-        {QLatin1String(sizeConstraint), LayoutPropertySizeConstraint},
-        {QLatin1String(boxStretchPropertyC ), LayoutPropertyBoxStretch},
-        {QLatin1String(gridRowStretchPropertyC), LayoutPropertyGridRowStretch},
-        {QLatin1String(gridColumnStretchPropertyC), LayoutPropertyGridColumnStretch},
-        {QLatin1String(gridRowMinimumHeightPropertyC), LayoutPropertyGridRowMinimumHeight},
-        {QLatin1String(gridColumnMinimumWidthPropertyC), LayoutPropertyGridColumnMinimumWidth}
+        {QLatin1StringView(leftMargin), LayoutPropertyLeftMargin},
+        {QLatin1StringView(topMargin), LayoutPropertyTopMargin},
+        {QLatin1StringView(rightMargin), LayoutPropertyRightMargin},
+        {QLatin1StringView(bottomMargin), LayoutPropertyBottomMargin},
+        {QLatin1StringView(horizontalSpacing), LayoutPropertyHorizontalSpacing},
+        {QLatin1StringView(verticalSpacing), LayoutPropertyVerticalSpacing},
+        {QLatin1StringView(spacing), LayoutPropertySpacing},
+        {QLatin1StringView(sizeConstraint), LayoutPropertySizeConstraint},
+        {QLatin1StringView(boxStretchPropertyC), LayoutPropertyBoxStretch},
+        {QLatin1StringView(gridRowStretchPropertyC), LayoutPropertyGridRowStretch},
+        {QLatin1StringView(gridColumnStretchPropertyC), LayoutPropertyGridColumnStretch},
+        {QLatin1StringView(gridRowMinimumHeightPropertyC), LayoutPropertyGridRowMinimumHeight},
+        {QLatin1StringView(gridColumnMinimumWidthPropertyC), LayoutPropertyGridColumnMinimumWidth}
     };
     return namePropertyMap.value(name, LayoutPropertyNone);
 }
@@ -153,48 +153,48 @@ LayoutPropertySheet::LayoutPropertySheet(QLayout *l, QObject *parent)
     : QDesignerPropertySheet(l, parent), m_layout(l)
 {
     const QString layoutGroup = u"Layout"_s;
-    int pindex = createFakeProperty(QLatin1String(leftMargin), 0);
+    int pindex = createFakeProperty(QLatin1StringView(leftMargin), 0);
     setPropertyGroup(pindex, layoutGroup);
 
-    pindex = createFakeProperty(QLatin1String(topMargin), 0);
+    pindex = createFakeProperty(QLatin1StringView(topMargin), 0);
     setPropertyGroup(pindex, layoutGroup);
 
-    pindex = createFakeProperty(QLatin1String(rightMargin), 0);
+    pindex = createFakeProperty(QLatin1StringView(rightMargin), 0);
     setPropertyGroup(pindex, layoutGroup);
 
-    pindex = createFakeProperty(QLatin1String(bottomMargin), 0);
+    pindex = createFakeProperty(QLatin1StringView(bottomMargin), 0);
     setPropertyGroup(pindex, layoutGroup);
 
     const int visibleMask = LayoutProperties::visibleProperties(m_layout);
     if (visibleMask & LayoutProperties::HorizSpacingProperty) {
-        pindex = createFakeProperty(QLatin1String(horizontalSpacing), 0);
+        pindex = createFakeProperty(QLatin1StringView(horizontalSpacing), 0);
         setPropertyGroup(pindex, layoutGroup);
 
-        pindex = createFakeProperty(QLatin1String(verticalSpacing), 0);
+        pindex = createFakeProperty(QLatin1StringView(verticalSpacing), 0);
         setPropertyGroup(pindex, layoutGroup);
 
-        setAttribute(indexOf(QLatin1String(spacing)), true);
+        setAttribute(indexOf(QLatin1StringView(spacing)), true);
     }
 
     // Stretch
     if (visibleMask & LayoutProperties::BoxStretchProperty) {
-        pindex = createFakeProperty(QLatin1String(boxStretchPropertyC), QByteArray());
+        pindex = createFakeProperty(QLatin1StringView(boxStretchPropertyC), QByteArray());
         setPropertyGroup(pindex, layoutGroup);
         setAttribute(pindex, true);
     } else {
         // Add the grid per-row/column stretch and size limits
         if (visibleMask & LayoutProperties::GridColumnStretchProperty) {
             const QByteArray empty;
-            pindex = createFakeProperty(QLatin1String(gridRowStretchPropertyC), empty);
+            pindex = createFakeProperty(QLatin1StringView(gridRowStretchPropertyC), empty);
             setPropertyGroup(pindex, layoutGroup);
             setAttribute(pindex, true);
-            pindex = createFakeProperty(QLatin1String(gridColumnStretchPropertyC), empty);
+            pindex = createFakeProperty(QLatin1StringView(gridColumnStretchPropertyC), empty);
             setPropertyGroup(pindex, layoutGroup);
             setAttribute(pindex, true);
-            pindex = createFakeProperty(QLatin1String(gridRowMinimumHeightPropertyC), empty);
+            pindex = createFakeProperty(QLatin1StringView(gridRowMinimumHeightPropertyC), empty);
             setPropertyGroup(pindex, layoutGroup);
             setAttribute(pindex, true);
-            pindex = createFakeProperty(QLatin1String(gridColumnMinimumWidthPropertyC), empty);
+            pindex = createFakeProperty(QLatin1StringView(gridColumnMinimumWidthPropertyC), empty);
             setPropertyGroup(pindex, layoutGroup);
             setAttribute(pindex, true);
         }
@@ -204,7 +204,7 @@ LayoutPropertySheet::LayoutPropertySheet(QLayout *l, QObject *parent)
     // as it affects the layout parent widget and thus
     // conflicts with Designer's special layout widget.
     // It will take effect on the preview only.
-    pindex = createFakeProperty(QLatin1String(sizeConstraint));
+    pindex = createFakeProperty(QLatin1StringView(sizeConstraint));
     setPropertyGroup(pindex, layoutGroup);
 #endif
 }
@@ -415,8 +415,8 @@ void LayoutPropertySheet::setChanged(int index, bool changed)
     switch (type) {
     case LayoutPropertySpacing:
         if (LayoutProperties::visibleProperties(m_layout) & LayoutProperties::HorizSpacingProperty) {
-            setChanged(indexOf(QLatin1String(horizontalSpacing)), changed);
-            setChanged(indexOf(QLatin1String(verticalSpacing)), changed);
+            setChanged(indexOf(QLatin1StringView(horizontalSpacing)), changed);
+            setChanged(indexOf(QLatin1StringView(verticalSpacing)), changed);
         }
         break;
     default:
@@ -437,31 +437,31 @@ void LayoutPropertySheet::stretchAttributesToDom(QDesignerFormEditorInterface *c
 
     // Stretch
     if (visibleMask & LayoutProperties::BoxStretchProperty) {
-        const int index = sheet->indexOf(QLatin1String(boxStretchPropertyC));
+        const int index = sheet->indexOf(QLatin1StringView(boxStretchPropertyC));
         Q_ASSERT(index != -1);
         if (sheet->isChanged(index))
             domLayout->setAttributeStretch(sheet->property(index).toString());
     }
     if (visibleMask & LayoutProperties::GridColumnStretchProperty) {
-        const int index = sheet->indexOf(QLatin1String(gridColumnStretchPropertyC));
+        const int index = sheet->indexOf(QLatin1StringView(gridColumnStretchPropertyC));
         Q_ASSERT(index != -1);
         if (sheet->isChanged(index))
             domLayout->setAttributeColumnStretch(sheet->property(index).toString());
     }
     if (visibleMask & LayoutProperties::GridRowStretchProperty) {
-        const int index = sheet->indexOf(QLatin1String(gridRowStretchPropertyC));
+        const int index = sheet->indexOf(QLatin1StringView(gridRowStretchPropertyC));
         Q_ASSERT(index != -1);
         if (sheet->isChanged(index))
             domLayout->setAttributeRowStretch(sheet->property(index).toString());
     }
     if (visibleMask & LayoutProperties::GridRowMinimumHeightProperty) {
-        const int index = sheet->indexOf(QLatin1String(gridRowMinimumHeightPropertyC));
+        const int index = sheet->indexOf(QLatin1StringView(gridRowMinimumHeightPropertyC));
         Q_ASSERT(index != -1);
         if (sheet->isChanged(index))
             domLayout->setAttributeRowMinimumHeight(sheet->property(index).toString());
     }
     if (visibleMask & LayoutProperties::GridColumnMinimumWidthProperty) {
-        const int index = sheet->indexOf(QLatin1String(gridColumnMinimumWidthPropertyC));
+        const int index = sheet->indexOf(QLatin1StringView(gridColumnMinimumWidthPropertyC));
         Q_ASSERT(index != -1);
         if (sheet->isChanged(index))
             domLayout->setAttributeColumnMinimumWidth(sheet->property(index).toString());
@@ -475,15 +475,15 @@ void LayoutPropertySheet::markChangedStretchProperties(QDesignerFormEditorInterf
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core->extensionManager(), lt);
     Q_ASSERT(sheet);
     if (!domLayout->attributeStretch().isEmpty())
-        sheet->setChanged(sheet->indexOf(QLatin1String(boxStretchPropertyC)), true);
+        sheet->setChanged(sheet->indexOf(QLatin1StringView(boxStretchPropertyC)), true);
     if (!domLayout->attributeRowStretch().isEmpty())
-        sheet->setChanged(sheet->indexOf(QLatin1String(gridRowStretchPropertyC)), true);
+        sheet->setChanged(sheet->indexOf(QLatin1StringView(gridRowStretchPropertyC)), true);
     if (!domLayout->attributeColumnStretch().isEmpty())
-        sheet->setChanged(sheet->indexOf(QLatin1String(gridColumnStretchPropertyC)), true);
+        sheet->setChanged(sheet->indexOf(QLatin1StringView(gridColumnStretchPropertyC)), true);
    if (!domLayout->attributeColumnMinimumWidth().isEmpty())
-        sheet->setChanged(sheet->indexOf(QLatin1String(gridColumnMinimumWidthPropertyC)), true);
+        sheet->setChanged(sheet->indexOf(QLatin1StringView(gridColumnMinimumWidthPropertyC)), true);
    if (!domLayout->attributeRowMinimumHeight().isEmpty())
-        sheet->setChanged(sheet->indexOf(QLatin1String(gridRowMinimumHeightPropertyC)), true);
+        sheet->setChanged(sheet->indexOf(QLatin1StringView(gridRowMinimumHeightPropertyC)), true);
 }
 
 }
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index d284199a1..5f32a330b 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -1339,7 +1339,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBar *toolBar, DomWidget *ui_parent
 
         DomProperty *attr = new DomProperty();
         attr->setAttributeName(u"toolBarArea"_s);
-        attr->setElementEnum(QLatin1String(toolBarAreaMetaEnum().valueToKey(area)));
+        attr->setElementEnum(QLatin1StringView(toolBarAreaMetaEnum().valueToKey(area)));
         attributes  << attr;
 
         attr = new DomProperty();
@@ -1497,7 +1497,7 @@ DomWidget *QDesignerResource::saveWidget(QWizardPage *wizardPage, DomWidget *ui_
     DomWidget *ui_widget = QAbstractFormBuilder::createDom(wizardPage, ui_parentWidget, true);
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), wizardPage);
     // Save the page id (string) attribute, append to existing attributes
-    const QString pageIdPropertyName = QLatin1String(QWizardPagePropertySheet::pageIdProperty);
+    const QString pageIdPropertyName = QLatin1StringView(QWizardPagePropertySheet::pageIdProperty);
     const int pageIdIndex = sheet->indexOf(pageIdPropertyName);
     if (pageIdIndex != -1 && sheet->isChanged(pageIdIndex)) {
         DomProperty *property = variantToDomProperty(this, wizardPage->metaObject(), pageIdPropertyName, sheet->property(pageIdIndex));
@@ -1684,7 +1684,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection)
     m_copyWidget = true;
 
     DomWidget *ui_widget = new DomWidget();
-    ui_widget->setAttributeName(QLatin1String(clipboardObjectName));
+    ui_widget->setAttributeName(QLatin1StringView(clipboardObjectName));
     bool hasItems = false;
     // Widgets
     if (!selection.m_widgets.isEmpty()) {
@@ -1723,7 +1723,7 @@ DomUI *QDesignerResource::copy(const FormBuilderClipboard &selection)
     }
     // UI
     DomUI *ui = new DomUI();
-    ui->setAttributeVersion(QLatin1String(currentUiVersion));
+    ui->setAttributeVersion(QLatin1StringView(currentUiVersion));
     ui->setElementWidget(ui_widget);
     ui->setElementResources(saveResources(m_resourceBuilder->usedQrcFiles()));
     if (DomCustomWidgets *cws = saveCustomWidgets())
diff --git a/src/designer/src/components/formeditor/qmdiarea_container.cpp b/src/designer/src/components/formeditor/qmdiarea_container.cpp
index 9400d57d6..c4a231f9c 100644
--- a/src/designer/src/components/formeditor/qmdiarea_container.cpp
+++ b/src/designer/src/components/formeditor/qmdiarea_container.cpp
@@ -113,8 +113,8 @@ QMdiAreaPropertySheet::QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent)
     QDesignerPropertySheet(mdiArea, parent),
     m_windowTitleProperty(u"windowTitle"_s)
 {
-    createFakeProperty(QLatin1String(subWindowNameC), QString());
-    createFakeProperty(QLatin1String(subWindowTitleC), QString());
+    createFakeProperty(QLatin1StringView(subWindowNameC), QString());
+    createFakeProperty(QLatin1StringView(subWindowTitleC), QString());
 }
 
 QMdiAreaPropertySheet::MdiAreaProperty QMdiAreaPropertySheet::mdiAreaProperty(const QString &name)
@@ -122,8 +122,8 @@ QMdiAreaPropertySheet::MdiAreaProperty QMdiAreaPropertySheet::mdiAreaProperty(co
     using MdiAreaPropertyHash = QHash<QString, MdiAreaProperty>;
     static MdiAreaPropertyHash mdiAreaPropertyHash;
     if (mdiAreaPropertyHash.isEmpty()) {
-        mdiAreaPropertyHash.insert(QLatin1String(subWindowNameC), MdiAreaSubWindowName);
-        mdiAreaPropertyHash.insert(QLatin1String(subWindowTitleC), MdiAreaSubWindowTitle);
+        mdiAreaPropertyHash.insert(QLatin1StringView(subWindowNameC), MdiAreaSubWindowName);
+        mdiAreaPropertyHash.insert(QLatin1StringView(subWindowTitleC), MdiAreaSubWindowTitle);
     }
     return mdiAreaPropertyHash.value(name,MdiAreaNone);
 }
diff --git a/src/designer/src/components/formeditor/qwizard_container.cpp b/src/designer/src/components/formeditor/qwizard_container.cpp
index 40c8aa024..06fabd275 100644
--- a/src/designer/src/components/formeditor/qwizard_container.cpp
+++ b/src/designer/src/components/formeditor/qwizard_container.cpp
@@ -153,7 +153,7 @@ const char *QWizardPagePropertySheet::pageIdProperty = "pageId";
 
 QWizardPagePropertySheet::QWizardPagePropertySheet(QWizardPage *object, QObject *parent) :
     QDesignerPropertySheet(object, parent),
-    m_pageIdIndex(createFakeProperty(QLatin1String(pageIdProperty), QString()))
+    m_pageIdIndex(createFakeProperty(QLatin1StringView(pageIdProperty), QString()))
 {
     setAttribute(m_pageIdIndex, true);
 }
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
index a3d468600..005437e22 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -115,7 +115,7 @@ namespace qdesigner_internal {
     ObjectData::ObjectData(QObject *parent, QObject *object, const ModelRecursionContext &ctx) :
        m_parent(parent),
        m_object(object),
-       m_className(QLatin1String(object->metaObject()->className())),
+       m_className(QLatin1StringView(object->metaObject()->className())),
        m_objectName(object->objectName())
     {
 
@@ -161,7 +161,7 @@ namespace qdesigner_internal {
             if (const QLayout *layout = w->layout()) {
                 m_type = LayoutWidget;
                 m_managedLayoutType = LayoutInfo::layoutType(ctx.core, layout);
-                m_className = QLatin1String(layout->metaObject()->className());
+                m_className = QLatin1StringView(layout->metaObject()->className());
                 m_objectName = layout->objectName();
             }
             return;
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
index b4f9ccdc2..6d0234581 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -1140,19 +1140,19 @@ QStringList DesignerPropertyManager::attributes(int propertyType) const
 
     QStringList list = QtVariantPropertyManager::attributes(propertyType);
     if (propertyType == designerFlagTypeId()) {
-        list.append(QLatin1String(flagsAttributeC));
+        list.append(QLatin1StringView(flagsAttributeC));
     } else if (propertyType == designerPixmapTypeId()) {
-        list.append(QLatin1String(defaultResourceAttributeC));
+        list.append(QLatin1StringView(defaultResourceAttributeC));
     } else if (propertyType == designerIconTypeId()) {
-        list.append(QLatin1String(defaultResourceAttributeC));
+        list.append(QLatin1StringView(defaultResourceAttributeC));
     } else if (propertyType == designerStringTypeId() || propertyType == QMetaType::QString) {
-        list.append(QLatin1String(validationModesAttributeC));
-        list.append(QLatin1String(fontAttributeC));
-        list.append(QLatin1String(themeAttributeC));
+        list.append(QLatin1StringView(validationModesAttributeC));
+        list.append(QLatin1StringView(fontAttributeC));
+        list.append(QLatin1StringView(themeAttributeC));
     } else if (propertyType == QMetaType::QPalette) {
-        list.append(QLatin1String(superPaletteAttributeC));
+        list.append(QLatin1StringView(superPaletteAttributeC));
     }
-    list.append(QLatin1String(resettableAttributeC));
+    list.append(QLatin1StringView(resettableAttributeC));
     return list;
 }
 
@@ -1161,23 +1161,23 @@ int DesignerPropertyManager::attributeType(int propertyType, const QString &attr
     if (!isPropertyTypeSupported(propertyType))
         return 0;
 
-    if (propertyType == designerFlagTypeId() && attribute == QLatin1String(flagsAttributeC))
+    if (propertyType == designerFlagTypeId() && attribute == QLatin1StringView(flagsAttributeC))
         return designerFlagListTypeId();
-    if (propertyType == designerPixmapTypeId() && attribute == QLatin1String(defaultResourceAttributeC))
+    if (propertyType == designerPixmapTypeId() && attribute == QLatin1StringView(defaultResourceAttributeC))
         return QMetaType::QPixmap;
-    if (propertyType == designerIconTypeId() && attribute == QLatin1String(defaultResourceAttributeC))
+    if (propertyType == designerIconTypeId() && attribute == QLatin1StringView(defaultResourceAttributeC))
         return QMetaType::QIcon;
-    if (attribute == QLatin1String(resettableAttributeC))
+    if (attribute == QLatin1StringView(resettableAttributeC))
         return QMetaType::Bool;
     if (propertyType == designerStringTypeId() || propertyType == QMetaType::QString) {
-        if (attribute == QLatin1String(validationModesAttributeC))
+        if (attribute == QLatin1StringView(validationModesAttributeC))
             return QMetaType::Int;
-        if (attribute == QLatin1String(fontAttributeC))
+        if (attribute == QLatin1StringView(fontAttributeC))
             return QMetaType::QFont;
-        if (attribute == QLatin1String(themeAttributeC))
+        if (attribute == QLatin1StringView(themeAttributeC))
             return QMetaType::Bool;
     }
-    if (propertyType == QMetaType::QPalette && attribute == QLatin1String(superPaletteAttributeC))
+    if (propertyType == QMetaType::QPalette && attribute == QLatin1StringView(superPaletteAttributeC))
         return QMetaType::QPalette;
 
     return QtVariantPropertyManager::attributeType(propertyType, attribute);
@@ -1187,13 +1187,13 @@ QVariant DesignerPropertyManager::attributeValue(const QtProperty *property, con
 {
     QtProperty *prop = const_cast<QtProperty *>(property);
 
-    if (attribute == QLatin1String(resettableAttributeC)) {
+    if (attribute == QLatin1StringView(resettableAttributeC)) {
         const auto it = m_resetMap.constFind(prop);
         if (it != m_resetMap.constEnd())
             return it.value();
     }
 
-    if (attribute == QLatin1String(flagsAttributeC)) {
+    if (attribute == QLatin1StringView(flagsAttributeC)) {
         const auto it = m_flagValues.constFind(prop);
         if (it != m_flagValues.constEnd()) {
             QVariant v;
@@ -1201,31 +1201,31 @@ QVariant DesignerPropertyManager::attributeValue(const QtProperty *property, con
             return v;
         }
     }
-    if (attribute == QLatin1String(validationModesAttributeC)) {
+    if (attribute == QLatin1StringView(validationModesAttributeC)) {
         const auto it = m_stringAttributes.constFind(prop);
         if (it !=  m_stringAttributes.constEnd())
             return it.value();
     }
 
-    if (attribute == QLatin1String(fontAttributeC)) {
+    if (attribute == QLatin1StringView(fontAttributeC)) {
         const auto it = m_stringFontAttributes.constFind(prop);
         if (it !=  m_stringFontAttributes.constEnd())
             return it.value();
     }
 
-    if (attribute == QLatin1String(themeAttributeC)) {
+    if (attribute == QLatin1StringView(themeAttributeC)) {
         const auto it = m_stringThemeAttributes.constFind(prop);
         if (it !=  m_stringThemeAttributes.constEnd())
             return it.value();
     }
 
-    if (attribute == QLatin1String(superPaletteAttributeC)) {
+    if (attribute == QLatin1StringView(superPaletteAttributeC)) {
         const auto it = m_paletteValues.constFind(prop);
         if (it != m_paletteValues.cend())
             return it.value().superPalette;
     }
 
-    if (attribute == QLatin1String(defaultResourceAttributeC)) {
+    if (attribute == QLatin1StringView(defaultResourceAttributeC)) {
         const auto itPix = m_defaultPixmaps.constFind(prop);
         if (itPix != m_defaultPixmaps.constEnd())
             return itPix.value();
@@ -1247,7 +1247,7 @@ QVariant DesignerPropertyManager::attributeValue(const QtProperty *property, con
 void DesignerPropertyManager::setAttribute(QtProperty *property,
             const QString &attribute, const QVariant &value)
 {
-    if (attribute == QLatin1String(resettableAttributeC) && m_resetMap.contains(property)) {
+    if (attribute == QLatin1StringView(resettableAttributeC) && m_resetMap.contains(property)) {
         if (value.userType() != QMetaType::Bool)
             return;
         const bool val = value.toBool();
@@ -1258,7 +1258,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
         emit attributeChanged(variantProperty(property), attribute, value);
         return;
     }
-    if (attribute == QLatin1String(flagsAttributeC) && m_flagValues.contains(property)) {
+    if (attribute == QLatin1StringView(flagsAttributeC) && m_flagValues.contains(property)) {
         if (value.userType() != designerFlagListTypeId())
             return;
 
@@ -1301,7 +1301,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
 
         emit propertyChanged(property);
         emit QtVariantPropertyManager::valueChanged(property, data.val);
-    } else if (attribute == QLatin1String(validationModesAttributeC) && m_stringAttributes.contains(property)) {
+    } else if (attribute == QLatin1StringView(validationModesAttributeC) && m_stringAttributes.contains(property)) {
         if (value.userType() != QMetaType::Int)
             return;
 
@@ -1316,7 +1316,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
         it.value() = newValue;
 
         emit attributeChanged(property, attribute, newValue);
-    } else if (attribute == QLatin1String(fontAttributeC) && m_stringFontAttributes.contains(property)) {
+    } else if (attribute == QLatin1StringView(fontAttributeC) && m_stringFontAttributes.contains(property)) {
         if (value.userType() != QMetaType::QFont)
             return;
 
@@ -1331,7 +1331,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
         it.value() = newValue;
 
         emit attributeChanged(property, attribute, newValue);
-    } else if (attribute == QLatin1String(themeAttributeC) && m_stringThemeAttributes.contains(property)) {
+    } else if (attribute == QLatin1StringView(themeAttributeC) && m_stringThemeAttributes.contains(property)) {
         if (value.userType() != QMetaType::Bool)
             return;
 
@@ -1346,7 +1346,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
         it.value() = newValue;
 
         emit attributeChanged(property, attribute, newValue);
-    } else if (attribute == QLatin1String(superPaletteAttributeC) && m_paletteValues.contains(property)) {
+    } else if (attribute == QLatin1StringView(superPaletteAttributeC) && m_paletteValues.contains(property)) {
         if (value.userType() != QMetaType::QPalette)
             return;
 
@@ -1371,7 +1371,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
 
         emit propertyChanged(property);
         emit QtVariantPropertyManager::valueChanged(property, data.val); // if resolve was done, this is also for consistency
-    } else if (attribute == QLatin1String(defaultResourceAttributeC) && m_defaultPixmaps.contains(property)) {
+    } else if (attribute == QLatin1StringView(defaultResourceAttributeC) && m_defaultPixmaps.contains(property)) {
         if (value.userType() != QMetaType::QPixmap)
             return;
 
@@ -1388,7 +1388,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
         emit attributeChanged(property, attribute, v);
 
         emit propertyChanged(property);
-    } else if (attribute == QLatin1String(defaultResourceAttributeC) && m_defaultIcons.contains(property)) {
+    } else if (attribute == QLatin1StringView(defaultResourceAttributeC) && m_defaultIcons.contains(property)) {
         if (value.userType() != QMetaType::QIcon)
             return;
 
@@ -1407,7 +1407,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property,
             for (auto itSub = subIconProperties.cbegin(), end = subIconProperties.cend(); itSub != end; ++itSub) {
                 QPair<QIcon::Mode, QIcon::State> pair = itSub.key();
                 QtProperty *subProp = itSub.value();
-                setAttribute(subProp, QLatin1String(defaultResourceAttributeC),
+                setAttribute(subProp, QLatin1StringView(defaultResourceAttributeC),
                              defaultIcon.pixmap(16, 16, pair.first, pair.second));
             }
         }
@@ -1573,7 +1573,7 @@ QString DesignerPropertyManager::valueText(const QtProperty *property) const
     if (vType == QMetaType::QString || vType == designerStringTypeId()) {
         const QString str = (QtVariantPropertyManager::valueType(property) == QMetaType::QString)
             ? value(property).toString() : qvariant_cast<PropertySheetStringValue>(value(property)).value();
-        const int validationMode = attributeValue(property, QLatin1String(validationModesAttributeC)).toInt();
+        const int validationMode = attributeValue(property, QLatin1StringView(validationModesAttributeC)).toInt();
         return TextPropertyEditor::stringToEditorString(str, static_cast<TextPropertyValidationMode>(validationMode));
     }
     if (vType == QMetaType::QStringList || vType == designerStringListTypeId()) {
@@ -1617,7 +1617,7 @@ void DesignerPropertyManager::reloadResourceProperties()
         for (auto itSub = subProperties.cbegin(), end = subProperties.cend(); itSub != end; ++itSub) {
             const QPair<QIcon::Mode, QIcon::State> pair = itSub.key();
             QtVariantProperty *subProperty = variantProperty(itSub.value());
-            subProperty->setAttribute(QLatin1String(defaultResourceAttributeC),
+            subProperty->setAttribute(QLatin1StringView(defaultResourceAttributeC),
                                       defaultIcon.pixmap(16, 16, pair.first, pair.second));
         }
 
@@ -1869,7 +1869,7 @@ void DesignerPropertyManager::setValue(QtProperty *property, const QVariant &val
             bool hasPath = iconPaths.contains(pair);
             subProperty->setModified(hasPath);
             subProperty->setValue(QVariant::fromValue(iconPaths.value(pair)));
-            subProperty->setAttribute(QLatin1String(defaultResourceAttributeC),
+            subProperty->setAttribute(QLatin1StringView(defaultResourceAttributeC),
                                       defaultIcon.pixmap(16, 16, pair.first, pair.second));
         }
         QtVariantProperty *themeSubProperty = variantProperty(m_propertyToTheme.value(property));
@@ -2068,7 +2068,7 @@ void DesignerPropertyManager::initializeProperty(QtProperty *property)
             m_defaultIcons[property] = QIcon();
 
             QtVariantProperty *themeProp = addProperty(QMetaType::QString, tr("Theme"));
-            themeProp->setAttribute(QLatin1String(themeAttributeC), true);
+            themeProp->setAttribute(QLatin1StringView(themeAttributeC), true);
             m_iconSubPropertyToProperty[themeProp] = property;
             m_propertyToTheme[property] = themeProp;
             m_resetMap[themeProp] = true;
@@ -2291,23 +2291,23 @@ void DesignerEditorFactory::slotAttributeChanged(QtProperty *property, const QSt
 {
     QtVariantPropertyManager *manager = propertyManager(property);
     const int type = manager->propertyType(property);
-    if (type == DesignerPropertyManager::designerPixmapTypeId() && attribute == QLatin1String(defaultResourceAttributeC)) {
+    if (type == DesignerPropertyManager::designerPixmapTypeId() && attribute == QLatin1StringView(defaultResourceAttributeC)) {
         const QPixmap pixmap = qvariant_cast<QPixmap>(value);
         applyToEditors(m_pixmapPropertyToEditors.value(property), &PixmapEditor::setDefaultPixmap, pixmap);
     } else if (type == DesignerPropertyManager::designerStringTypeId() || type == QMetaType::QString) {
-        if (attribute == QLatin1String(validationModesAttributeC)) {
+        if (attribute == QLatin1StringView(validationModesAttributeC)) {
             const TextPropertyValidationMode validationMode = static_cast<TextPropertyValidationMode>(value.toInt());
             applyToEditors(m_stringPropertyToEditors.value(property), &TextEditor::setTextPropertyValidationMode, validationMode);
         }
-        if (attribute == QLatin1String(fontAttributeC)) {
+        if (attribute == QLatin1StringView(fontAttributeC)) {
             const QFont font = qvariant_cast<QFont>(value);
             applyToEditors(m_stringPropertyToEditors.value(property), &TextEditor::setRichTextDefaultFont, font);
         }
-        if (attribute == QLatin1String(themeAttributeC)) {
+        if (attribute == QLatin1StringView(themeAttributeC)) {
             const bool themeEnabled = value.toBool();
             applyToEditors(m_stringPropertyToEditors.value(property), &TextEditor::setIconThemeModeEnabled, themeEnabled);
         }
-    } else if (type == QMetaType::QPalette && attribute == QLatin1String(superPaletteAttributeC)) {
+    } else if (type == QMetaType::QPalette && attribute == QLatin1StringView(superPaletteAttributeC)) {
         const QPalette palette = qvariant_cast<QPalette>(value);
         applyToEditors(m_palettePropertyToEditors.value(property), &PaletteEditorButton::setSuperPalette, palette);
     }
@@ -2320,7 +2320,7 @@ void DesignerEditorFactory::slotPropertyChanged(QtProperty *property)
     if (type == DesignerPropertyManager::designerIconTypeId()) {
         QPixmap defaultPixmap;
         if (!property->isModified())
-            defaultPixmap = qvariant_cast<QIcon>(manager->attributeValue(property, QLatin1String(defaultResourceAttributeC))).pixmap(16, 16);
+            defaultPixmap = qvariant_cast<QIcon>(manager->attributeValue(property, QLatin1StringView(defaultResourceAttributeC))).pixmap(16, 16);
         else if (m_fwb)
             defaultPixmap = m_fwb->iconCache()->icon(qvariant_cast<PropertySheetIconValue>(manager->value(property))).pixmap(16, 16);
         const auto editors = m_iconPropertyToEditors.value(property);
@@ -2403,12 +2403,12 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager,
     }
         break;
     case QMetaType::QString: {
-        const TextPropertyValidationMode tvm = static_cast<TextPropertyValidationMode>(manager->attributeValue(property, QLatin1String(validationModesAttributeC)).toInt());
+        const TextPropertyValidationMode tvm = static_cast<TextPropertyValidationMode>(manager->attributeValue(property, QLatin1StringView(validationModesAttributeC)).toInt());
         TextEditor *ed = createTextEditor(parent, tvm, manager->value(property).toString());
-        const QVariant richTextDefaultFont = manager->attributeValue(property, QLatin1String(fontAttributeC));
+        const QVariant richTextDefaultFont = manager->attributeValue(property, QLatin1StringView(fontAttributeC));
         if (richTextDefaultFont.metaType().id() == QMetaType::QFont)
             ed->setRichTextDefaultFont(qvariant_cast<QFont>(richTextDefaultFont));
-        const bool themeEnabled = manager->attributeValue(property, QLatin1String(themeAttributeC)).toBool();
+        const bool themeEnabled = manager->attributeValue(property, QLatin1StringView(themeAttributeC)).toBool();
         ed->setIconThemeModeEnabled(themeEnabled);
         m_stringPropertyToEditors[property].append(ed);
         m_editorToStringProperty[ed] = property;
@@ -2419,7 +2419,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager,
         break;
     case QMetaType::QPalette: {
         PaletteEditorButton *ed = new PaletteEditorButton(m_core, qvariant_cast<QPalette>(manager->value(property)), parent);
-        ed->setSuperPalette(qvariant_cast<QPalette>(manager->attributeValue(property, QLatin1String(superPaletteAttributeC))));
+        ed->setSuperPalette(qvariant_cast<QPalette>(manager->attributeValue(property, QLatin1StringView(superPaletteAttributeC))));
         m_palettePropertyToEditors[property].append(ed);
         m_editorToPaletteProperty[ed] = property;
         connect(ed, &QObject::destroyed, this, &DesignerEditorFactory::slotEditorDestroyed);
@@ -2484,7 +2484,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager,
             PixmapEditor *ed = new PixmapEditor(m_core, parent);
             ed->setPixmapCache(m_fwb->pixmapCache());
             ed->setPath(qvariant_cast<PropertySheetPixmapValue>(manager->value(property)).path());
-            ed->setDefaultPixmap(qvariant_cast<QPixmap>(manager->attributeValue(property, QLatin1String(defaultResourceAttributeC))));
+            ed->setDefaultPixmap(qvariant_cast<QPixmap>(manager->attributeValue(property, QLatin1StringView(defaultResourceAttributeC))));
             ed->setSpacing(m_spacing);
             m_pixmapPropertyToEditors[property].append(ed);
             m_editorToPixmapProperty[ed] = property;
@@ -2500,7 +2500,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager,
             ed->setPath(value.pixmap(QIcon::Normal, QIcon::Off).path());
             QPixmap defaultPixmap;
             if (!property->isModified())
-                defaultPixmap = qvariant_cast<QIcon>(manager->attributeValue(property, QLatin1String(defaultResourceAttributeC))).pixmap(16, 16);
+                defaultPixmap = qvariant_cast<QIcon>(manager->attributeValue(property, QLatin1StringView(defaultResourceAttributeC))).pixmap(16, 16);
             else if (m_fwb)
                 defaultPixmap = m_fwb->iconCache()->icon(value).pixmap(16, 16);
             ed->setDefaultPixmap(defaultPixmap);
@@ -2512,9 +2512,9 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager,
             connect(ed, &PixmapEditor::themeChanged, this, &DesignerEditorFactory::slotIconThemeChanged);
             editor = ed;
         } else if (type == DesignerPropertyManager::designerStringTypeId()) {
-            const TextPropertyValidationMode tvm = static_cast<TextPropertyValidationMode>(manager->attributeValue(property, QLatin1String(validationModesAttributeC)).toInt());
+            const TextPropertyValidationMode tvm = static_cast<TextPropertyValidationMode>(manager->attributeValue(property, QLatin1StringView(validationModesAttributeC)).toInt());
             TextEditor *ed = createTextEditor(parent, tvm, qvariant_cast<PropertySheetStringValue>(manager->value(property)).value());
-            const QVariant richTextDefaultFont = manager->attributeValue(property, QLatin1String(fontAttributeC));
+            const QVariant richTextDefaultFont = manager->attributeValue(property, QLatin1StringView(fontAttributeC));
             if (richTextDefaultFont.metaType().id() == QMetaType::QFont)
                 ed->setRichTextDefaultFont(qvariant_cast<QFont>(richTextDefaultFont));
             m_stringPropertyToEditors[property].append(ed);
@@ -2546,7 +2546,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager,
         break;
     }
     return m_resetDecorator->editor(editor,
-            manager->variantProperty(property)->attributeValue(QLatin1String(resettableAttributeC)).toBool(),
+            manager->variantProperty(property)->attributeValue(QLatin1StringView(resettableAttributeC)).toBool(),
             manager, property, parent);
 }
 
diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
index 0a2c80232..129afc408 100644
--- a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
@@ -390,14 +390,14 @@ namespace qdesigner_internal {
     {
         switch (currentStage) {
         case ParseBeginning:
-            return startElement == QLatin1String(rootTagC) ? ParseWithinRoot : ParseError;
+            return startElement == QLatin1StringView(rootTagC) ? ParseWithinRoot : ParseError;
         case ParseWithinRoot:
         case ParseWithinDisplay: // Next mapping, was in <display>
-            return startElement == QLatin1String(mappingTagC) ? ParseWithinMapping : ParseError;
+            return startElement == QLatin1StringView(mappingTagC) ? ParseWithinMapping : ParseError;
         case ParseWithinMapping:
-            return startElement == QLatin1String(familyTagC) ? ParseWithinFamily : ParseError;
+            return startElement == QLatin1StringView(familyTagC) ? ParseWithinFamily : ParseError;
         case ParseWithinFamily:
-            return startElement == QLatin1String(displayTagC) ? ParseWithinDisplay : ParseError;
+            return startElement == QLatin1StringView(displayTagC) ? ParseWithinDisplay : ParseError;
         case ParseError:
             break;
         }
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.cpp b/src/designer/src/components/propertyeditor/paletteeditor.cpp
index 5a46bca01..6ef6b1cfa 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.cpp
+++ b/src/designer/src/components/propertyeditor/paletteeditor.cpp
@@ -388,7 +388,7 @@ PaletteModel::PaletteModel(QObject *parent)  :
     for (int r = QPalette::WindowText; r < QPalette::NColorRoles; r++) {
         const auto role = static_cast<QPalette::ColorRole>(r);
         if (role != QPalette::NoRole)
-            m_roleEntries.append({QLatin1String(e.key(r)), role});
+            m_roleEntries.append({QLatin1StringView(e.key(r)), role});
     }
 }
 
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 7b40c54ba..04693cbbf 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -308,13 +308,13 @@ PropertyEditor::PropertyEditor(QDesignerFormEditorInterface *core, QWidget *pare
 
     // retrieve initial settings
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    settings->beginGroup(QLatin1String(SettingsGroupC));
-    const SettingsView view = settings->value(QLatin1String(ViewKeyC), TreeView).toInt() == TreeView ? TreeView :  ButtonView;
+    settings->beginGroup(QLatin1StringView(SettingsGroupC));
+    const SettingsView view = settings->value(QLatin1StringView(ViewKeyC), TreeView).toInt() == TreeView ? TreeView :  ButtonView;
     // Coloring not available unless treeview and not sorted
-    m_sorting = settings->value(QLatin1String(SortedKeyC), false).toBool();
-    m_coloring = settings->value(QLatin1String(ColorKeyC), true).toBool();
-    const QVariantMap expansionState = settings->value(QLatin1String(ExpansionKeyC), QVariantMap()).toMap();
-    const int splitterPosition = settings->value(QLatin1String(SplitterPositionKeyC), 150).toInt();
+    m_sorting = settings->value(QLatin1StringView(SortedKeyC), false).toBool();
+    m_coloring = settings->value(QLatin1StringView(ColorKeyC), true).toBool();
+    const QVariantMap expansionState = settings->value(QLatin1StringView(ExpansionKeyC), QVariantMap()).toMap();
+    const int splitterPosition = settings->value(QLatin1StringView(SplitterPositionKeyC), 150).toInt();
     settings->endGroup();
     // Apply settings
     m_sortingAction->setChecked(m_sorting);
@@ -351,16 +351,16 @@ PropertyEditor::~PropertyEditor()
 void PropertyEditor::saveSettings() const
 {
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    settings->beginGroup(QLatin1String(SettingsGroupC));
-    settings->setValue(QLatin1String(ViewKeyC), QVariant(m_treeAction->isChecked() ? TreeView : ButtonView));
-    settings->setValue(QLatin1String(ColorKeyC), QVariant(m_coloring));
-    settings->setValue(QLatin1String(SortedKeyC), QVariant(m_sorting));
+    settings->beginGroup(QLatin1StringView(SettingsGroupC));
+    settings->setValue(QLatin1StringView(ViewKeyC), QVariant(m_treeAction->isChecked() ? TreeView : ButtonView));
+    settings->setValue(QLatin1StringView(ColorKeyC), QVariant(m_coloring));
+    settings->setValue(QLatin1StringView(SortedKeyC), QVariant(m_sorting));
     // Save last expansionState as QVariant map
     QVariantMap expansionState;
     for (auto it = m_expansionState.cbegin(), cend = m_expansionState.cend(); it != cend; ++it)
         expansionState.insert(it.key(), QVariant(it.value()));
-    settings->setValue(QLatin1String(ExpansionKeyC), expansionState);
-    settings->setValue(QLatin1String(SplitterPositionKeyC), m_treeBrowser->splitterPosition());
+    settings->setValue(QLatin1StringView(ExpansionKeyC), expansionState);
+    settings->setValue(QLatin1StringView(SplitterPositionKeyC), m_treeBrowser->splitterPosition());
     settings->endGroup();
 }
 
@@ -807,14 +807,14 @@ QString PropertyEditor::realClassName(QObject *object) const
     if (!object)
         return QString();
 
-    QString className = QLatin1String(object->metaObject()->className());
+    QString className = QLatin1StringView(object->metaObject()->className());
     const QDesignerWidgetDataBaseInterface *db = core()->widgetDataBase();
     if (QDesignerWidgetDataBaseItemInterface *widgetItem = db->item(db->indexOfObject(object, true))) {
         className = widgetItem->name();
 
         if (object->isWidgetType() && className == m_strings.m_qLayoutWidget
                 && static_cast<QWidget*>(object)->layout()) {
-            className = QLatin1String(static_cast<QWidget*>(object)->layout()->metaObject()->className());
+            className = QLatin1StringView(static_cast<QWidget*>(object)->layout()->metaObject()->className());
         }
     }
 
diff --git a/src/designer/src/components/signalsloteditor/connectdialog.cpp b/src/designer/src/components/signalsloteditor/connectdialog.cpp
index 1a6edc51c..6f122b16c 100644
--- a/src/designer/src/components/signalsloteditor/connectdialog.cpp
+++ b/src/designer/src/components/signalsloteditor/connectdialog.cpp
@@ -21,7 +21,7 @@ using namespace Qt::StringLiterals;
 
 static QString realClassName(QDesignerFormEditorInterface *core, QWidget *widget)
 {
-    QString class_name = QLatin1String(widget->metaObject()->className());
+    QString class_name = QLatin1StringView(widget->metaObject()->className());
     const QDesignerWidgetDataBaseInterface *wdb = core->widgetDataBase();
     const int idx = wdb->indexOfObject(widget);
     if (idx != -1)
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
index ce0fb308d..76239f07e 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -424,7 +424,7 @@ void SignalSlotEditor::fromUi(const DomConnections *connections, QWidget *parent
 
 static bool skipWidget(const QWidget *w)
 {
-    const QString name = QLatin1String(w->metaObject()->className());
+    const QString name = QLatin1StringView(w->metaObject()->className());
     if (name == "QDesignerWidget"_L1)
         return true;
     if (name == "QLayoutWidget"_L1)
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index f24af1fc8..b0e9855ff 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -98,7 +98,7 @@ void AbstractItemEditor::setupProperties(const PropertyDefinition *propList,
     for (int i = 0; propList[i].name; i++) {
         int type = propList[i].typeFunc ? propList[i].typeFunc() : propList[i].type;
         int role = propList[i].role;
-        QtVariantProperty *prop = m_propertyManager->addProperty(type, QLatin1String(propList[i].name));
+        QtVariantProperty *prop = m_propertyManager->addProperty(type, QLatin1StringView(propList[i].name));
         if (role == Qt::TextAlignmentRole) {
             prop->setAttribute(DesignerPropertyManager::alignDefaultAttribute(),
                                QVariant(uint(alignDefault)));
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp
index 209eefe72..92c85eb32 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -29,7 +29,7 @@ protected:
 };
 
 LabelTaskMenuInlineEditor::LabelTaskMenuInlineEditor(QLabel *w, QObject *parent) :
-      TaskMenuInlineEditor(w, ValidationRichText, QLatin1String(textPropertyC), parent)
+      TaskMenuInlineEditor(w, ValidationRichText, QLatin1StringView(textPropertyC), parent)
 {
 }
 
@@ -73,7 +73,7 @@ QList<QAction*> LabelTaskMenu::taskActions() const
 
 void LabelTaskMenu::editRichText()
 {
-    changeTextProperty(QLatin1String(textPropertyC), QString(), MultiSelectionMode, m_label->textFormat());
+    changeTextProperty(QLatin1StringView(textPropertyC), QString(), MultiSelectionMode, m_label->textFormat());
 }
 
 }
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index 2a94ef535..1fb1741c8 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -250,9 +250,9 @@ bool WidgetBoxCategoryModel::setData(const QModelIndex &index, const QVariant &v
     item.widget.setName(newName);
 
     const QDomDocument doc = stringToDom(WidgetBoxCategoryListView::widgetDomXml(item.widget));
-    QDomElement widget_elt = doc.firstChildElement(QLatin1String(widgetElementC));
+    QDomElement widget_elt = doc.firstChildElement(QLatin1StringView(widgetElementC));
     if (!widget_elt.isNull()) {
-        widget_elt.setAttribute(QLatin1String(nameAttributeC), newName);
+        widget_elt.setAttribute(QLatin1StringView(nameAttributeC), newName);
         item.widget.setDomXml(domToString(widget_elt));
     }
     emit dataChanged(index, index);
@@ -447,11 +447,11 @@ QString WidgetBoxCategoryListView::widgetDomXml(const QDesignerWidgetBoxInterfac
     QString domXml = widget.domXml();
 
     if (domXml.isEmpty()) {
-        domXml = QLatin1String(uiOpeningTagC);
+        domXml = QLatin1StringView(uiOpeningTagC);
         domXml += QStringLiteral("<widget class=\"");
         domXml += widget.name();
         domXml += QStringLiteral("\"/>");
-        domXml += QLatin1String(uiClosingTagC);
+        domXml += QLatin1StringView(uiClosingTagC);
     }
     return domXml;
 }
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index abb27aad8..ba4d88db4 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -90,7 +90,7 @@ QIcon WidgetBoxTreeWidget::iconForWidget(const QString &iconName) const
     if (iconName.isEmpty())
         return qdesigner_internal::qtLogoIcon();
 
-    if (iconName.startsWith(QLatin1String(iconPrefixC))) {
+    if (iconName.startsWith(QLatin1StringView(iconPrefixC))) {
         const auto it = m_pluginIcons.constFind(iconName);
         if (it != m_pluginIcons.constEnd())
             return it.value();
@@ -123,9 +123,9 @@ void WidgetBoxTreeWidget::saveExpandedState() const
         }
     }
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    settings->beginGroup(QLatin1String(widgetBoxSettingsGroupC));
-    settings->setValue(QLatin1String(widgetBoxExpandedKeyC), closedCategories);
-    settings->setValue(QLatin1String(widgetBoxViewModeKeyC), m_iconMode);
+    settings->beginGroup(QLatin1StringView(widgetBoxSettingsGroupC));
+    settings->setValue(QLatin1StringView(widgetBoxExpandedKeyC), closedCategories);
+    settings->setValue(QLatin1StringView(widgetBoxViewModeKeyC), m_iconMode);
     settings->endGroup();
 }
 
@@ -134,9 +134,9 @@ void  WidgetBoxTreeWidget::restoreExpandedState()
     using StringSet = QSet<QString>;
     QDesignerSettingsInterface *settings = m_core->settingsManager();
     const QString groupKey = QLatin1StringView(widgetBoxSettingsGroupC) + u'/';
-    m_iconMode = settings->value(groupKey + QLatin1String(widgetBoxViewModeKeyC)).toBool();
+    m_iconMode = settings->value(groupKey + QLatin1StringView(widgetBoxViewModeKeyC)).toBool();
     updateViewMode();
-    const auto &closedCategoryList = settings->value(groupKey + QLatin1String(widgetBoxExpandedKeyC), QStringList()).toStringList();
+    const auto &closedCategoryList = settings->value(groupKey + QLatin1StringView(widgetBoxExpandedKeyC), QStringList()).toStringList();
     const StringSet closedCategories(closedCategoryList.cbegin(), closedCategoryList.cend());
     expandAll();
     if (closedCategories.isEmpty())
@@ -353,33 +353,33 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString
         switch (reader.readNext()) {
         case QXmlStreamReader::StartElement: {
             const auto tag = reader.name();
-            if (tag == QLatin1String(widgetBoxRootElementC)) {
+            if (tag == QLatin1StringView(widgetBoxRootElementC)) {
                 //<widgetbox version="4.5">
                 continue;
             }
-            if (tag == QLatin1String(categoryElementC)) {
+            if (tag == QLatin1StringView(categoryElementC)) {
                 // <category name="Layouts">
                 const QXmlStreamAttributes attributes = reader.attributes();
-                const QString categoryName = attributes.value(QLatin1String(wbNameAttributeC)).toString();
-                if (categoryName == QLatin1String(invisibleNameC)) {
+                const QString categoryName = attributes.value(QLatin1StringView(wbNameAttributeC)).toString();
+                if (categoryName == QLatin1StringView(invisibleNameC)) {
                     ignoreEntries = true;
                 } else {
                     Category category(categoryName);
-                    if (attributes.value(QLatin1String(typeAttributeC)) == QLatin1String(scratchPadValueC))
+                    if (attributes.value(QLatin1StringView(typeAttributeC)) == QLatin1StringView(scratchPadValueC))
                         category.setType(Category::Scratchpad);
                     cats->push_back(category);
                 }
                 continue;
             }
-            if (tag == QLatin1String(categoryEntryElementC)) {
+            if (tag == QLatin1StringView(categoryEntryElementC)) {
                 //  <categoryentry name="Vertical Layout" icon="win/editvlayout.png" type="default">
                 if (!ignoreEntries) {
                     QXmlStreamAttributes attr = reader.attributes();
-                    const QString widgetName = attr.value(QLatin1String(wbNameAttributeC)).toString();
-                    const QString widgetIcon = attr.value(QLatin1String(iconAttributeC)).toString();
+                    const QString widgetName = attr.value(QLatin1StringView(wbNameAttributeC)).toString();
+                    const QString widgetIcon = attr.value(QLatin1StringView(iconAttributeC)).toString();
                     const WidgetBoxTreeWidget::Widget::Type widgetType =
-                        attr.value(QLatin1String(typeAttributeC)).toString()
-                            == QLatin1String(customValueC) ?
+                        attr.value(QLatin1StringView(typeAttributeC)).toString()
+                            == QLatin1StringView(customValueC) ?
                         WidgetBoxTreeWidget::Widget::Custom :
                         WidgetBoxTreeWidget::Widget::Default;
 
@@ -398,14 +398,14 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString
         }
         case QXmlStreamReader::EndElement: {
            const auto tag = reader.name();
-           if (tag == QLatin1String(widgetBoxRootElementC)) {
+           if (tag == QLatin1StringView(widgetBoxRootElementC)) {
                continue;
            }
-           if (tag == QLatin1String(categoryElementC)) {
+           if (tag == QLatin1StringView(categoryElementC)) {
                ignoreEntries = false;
                continue;
            }
-           if (tag == QLatin1String(categoryEntryElementC)) {
+           if (tag == QLatin1StringView(categoryEntryElementC)) {
                continue;
            }
            break;
@@ -459,10 +459,10 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe
             if (nesting++ == 0) {
                 // First element must be <ui> or (legacy) <widget>
                 const auto name = r.name();
-                if (name == QLatin1String(uiElementC)) {
+                if (name == QLatin1StringView(uiElementC)) {
                     startTagPosition = currentPosition;
                 } else {
-                    if (name == QLatin1String(wbWidgetElementC)) {
+                    if (name == QLatin1StringView(wbWidgetElementC)) {
                         startTagPosition = currentPosition;
                         parsedWidgetTag = true;
                     } else {
@@ -472,7 +472,7 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe
                 }
             } else {
                 // We are within <ui> looking for the first <widget> tag
-                if (!parsedWidgetTag && r.name() == QLatin1String(wbWidgetElementC)) {
+                if (!parsedWidgetTag && r.name() == QLatin1StringView(wbWidgetElementC)) {
                     parsedWidgetTag = true;
                 }
             }
@@ -507,14 +507,14 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe
 
 void WidgetBoxTreeWidget::writeCategories(QXmlStreamWriter &writer, const CategoryList &cat_list) const
 {
-    const QString widgetbox = QLatin1String(widgetBoxRootElementC);
-    const QString name = QLatin1String(wbNameAttributeC);
-    const QString type = QLatin1String(typeAttributeC);
-    const QString icon = QLatin1String(iconAttributeC);
-    const QString defaultType = QLatin1String(defaultTypeValueC);
-    const QString category = QLatin1String(categoryElementC);
-    const QString categoryEntry = QLatin1String(categoryEntryElementC);
-    const QString iconPrefix = QLatin1String(iconPrefixC);
+    const QString widgetbox = QLatin1StringView(widgetBoxRootElementC);
+    const QString name = QLatin1StringView(wbNameAttributeC);
+    const QString type = QLatin1StringView(typeAttributeC);
+    const QString icon = QLatin1StringView(iconAttributeC);
+    const QString defaultType = QLatin1StringView(defaultTypeValueC);
+    const QString category = QLatin1StringView(categoryElementC);
+    const QString categoryEntry = QLatin1StringView(categoryEntryElementC);
+    const QString iconPrefix = QLatin1StringView(iconPrefixC);
 
     //
     // <widgetbox>
@@ -536,7 +536,7 @@ void WidgetBoxTreeWidget::writeCategories(QXmlStreamWriter &writer, const Catego
         writer.writeStartElement(category);
         writer.writeAttribute(name, cat.name());
         if (cat.type() == Category::Scratchpad)
-            writer.writeAttribute(type, QLatin1String(scratchPadValueC));
+            writer.writeAttribute(type, QLatin1StringView(scratchPadValueC));
 
         const int widgetCount = cat.widgetCount();
         for (int i = 0; i < widgetCount; ++i) {
@@ -595,8 +595,8 @@ WidgetBoxTreeWidget::CategoryList WidgetBoxTreeWidget::loadCustomCategoryList()
 
     static const QString customCatName = tr("Custom Widgets");
 
-    const QString invisible = QLatin1String(invisibleNameC);
-    const QString iconPrefix = QLatin1String(iconPrefixC);
+    const QString invisible = QLatin1StringView(invisibleNameC);
+    const QString iconPrefix = QLatin1StringView(iconPrefixC);
 
     for (QDesignerCustomWidgetInterface *c : customWidgets) {
         const QString dom_xml = c->domXml();
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index 10ebc8c92..f70c3c9b4 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -83,7 +83,7 @@ void AppFontManager::save(QDesignerSettingsInterface *s, const QString &prefix)
         fontFiles.push_back(fnp.first);
 
     s->beginGroup(prefix);
-    s->setValue(QLatin1String(fontFileKeyC),  fontFiles);
+    s->setValue(QLatin1StringView(fontFileKeyC),  fontFiles);
     s->endGroup();
 
     if (debugAppFontWidget)
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 08a6ede18..d52623a58 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -134,7 +134,7 @@ QStringList DockedMdiArea::uiFiles(const QMimeData *d) const
 {
     // Extract dropped UI files from Mime data.
     QStringList rc;
-    if (!d->hasFormat(QLatin1String(uriListMimeFormatC)))
+    if (!d->hasFormat(QLatin1StringView(uriListMimeFormatC)))
         return rc;
     const auto urls = d->urls();
     if (urls.isEmpty())
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index fab08021f..daf30026e 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -42,7 +42,7 @@ static void designerMessageHandler(QtMsgType type, const QMessageLogContext &con
 {
     // Only Designer warnings are displayed as box
     QDesigner *designerApp = qDesigner;
-    if (type != QtWarningMsg || !designerApp || !msg.startsWith(QLatin1String(designerWarningPrefix))) {
+    if (type != QtWarningMsg || !designerApp || !msg.startsWith(QLatin1StringView(designerWarningPrefix))) {
         previousMessageHandler(type, context, msg);
         return;
     }
@@ -56,8 +56,8 @@ QDesigner::QDesigner(int &argc, char **argv)
       m_workbench(0), m_suppressNewFormShow(false)
 {
     setOrganizationName(u"QtProject"_s);
-    QGuiApplication::setApplicationDisplayName(QLatin1String(designerDisplayName));
-    setApplicationName(QLatin1String(designerApplicationName));
+    QGuiApplication::setApplicationDisplayName(QLatin1StringView(designerDisplayName));
+    setApplicationName(QLatin1StringView(designerApplicationName));
     QDesignerComponents::initializeResources();
 
 #if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN)
@@ -101,7 +101,7 @@ void QDesigner::showErrorMessageBox(const QString &msg)
     if (!m_errorMessageDialog) {
         m_lastErrorMessage.clear();
         m_errorMessageDialog = new QErrorMessage(m_mainWindow);
-        const QString title = QCoreApplication::translate("QDesigner", "%1 - warning").arg(QLatin1String(designerApplicationName));
+        const QString title = QCoreApplication::translate("QDesigner", "%1 - warning").arg(QLatin1StringView(designerApplicationName));
         m_errorMessageDialog->setWindowTitle(title);
         m_errorMessageDialog->setMinimumSize(QSize(600, 250));
     }
diff --git a/src/designer/src/designer/qdesigner_settings.cpp b/src/designer/src/designer/qdesigner_settings.cpp
index 033b0ff7d..91d6b4915 100644
--- a/src/designer/src/designer/qdesigner_settings.cpp
+++ b/src/designer/src/designer/qdesigner_settings.cpp
@@ -98,44 +98,44 @@ void QDesignerSettings::restoreGeometry(QWidget *w, QRect fallBack) const
 
 QStringList QDesignerSettings::recentFilesList() const
 {
-    return settings()->value(QLatin1String(recentFilesListKey)).toStringList();
+    return settings()->value(QLatin1StringView(recentFilesListKey)).toStringList();
 }
 
 void QDesignerSettings::setRecentFilesList(const QStringList &sl)
 {
-    settings()->setValue(QLatin1String(recentFilesListKey), sl);
+    settings()->setValue(QLatin1StringView(recentFilesListKey), sl);
 }
 
 void QDesignerSettings::setShowNewFormOnStartup(bool showIt)
 {
-    settings()->setValue(QLatin1String(newFormShowKey), showIt);
+    settings()->setValue(QLatin1StringView(newFormShowKey), showIt);
 }
 
 bool QDesignerSettings::showNewFormOnStartup() const
 {
-    return settings()->value(QLatin1String(newFormShowKey), true).toBool();
+    return settings()->value(QLatin1StringView(newFormShowKey), true).toBool();
 }
 
 QByteArray QDesignerSettings::mainWindowState(UIMode mode) const
 {
-    return settings()->value(QLatin1String(mainWindowStateKey) + modeChar(mode)).toByteArray();
+    return settings()->value(QLatin1StringView(mainWindowStateKey) + modeChar(mode)).toByteArray();
 }
 
 void QDesignerSettings::setMainWindowState(UIMode mode, const QByteArray &mainWindowState)
 {
-    settings()->setValue(QLatin1String(mainWindowStateKey) + modeChar(mode), mainWindowState);
+    settings()->setValue(QLatin1StringView(mainWindowStateKey) + modeChar(mode), mainWindowState);
 }
 
 QByteArray QDesignerSettings::toolBarsState(UIMode mode) const
 {
-    QString key = QLatin1String(toolBarsStateKey);
+    QString key = QLatin1StringView(toolBarsStateKey);
     key += modeChar(mode);
     return settings()->value(key).toByteArray();
 }
 
 void QDesignerSettings::setToolBarsState(UIMode mode, const QByteArray &toolBarsState)
 {
-    QString key = QLatin1String(toolBarsStateKey);
+    QString key = QLatin1StringView(toolBarsStateKey);
     key += modeChar(mode);
     settings()->setValue(key, toolBarsState);
 }
@@ -143,8 +143,8 @@ void QDesignerSettings::setToolBarsState(UIMode mode, const QByteArray &toolBars
 void QDesignerSettings::clearBackup()
 {
     QDesignerSettingsInterface *s = settings();
-    s->remove(QLatin1String(backupOrgListKey));
-    s->remove(QLatin1String(backupBakListKey));
+    s->remove(QLatin1StringView(backupOrgListKey));
+    s->remove(QLatin1StringView(backupBakListKey));
 }
 
 void QDesignerSettings::setBackup(const QMap<QString, QString> &map)
@@ -153,14 +153,14 @@ void QDesignerSettings::setBackup(const QMap<QString, QString> &map)
     const QStringList bak = map.values();
 
     QDesignerSettingsInterface *s = settings();
-    s->setValue(QLatin1String(backupOrgListKey), org);
-    s->setValue(QLatin1String(backupBakListKey), bak);
+    s->setValue(QLatin1StringView(backupOrgListKey), org);
+    s->setValue(QLatin1StringView(backupBakListKey), bak);
 }
 
 QMap<QString, QString> QDesignerSettings::backup() const
 {
-    const QStringList org = settings()->value(QLatin1String(backupOrgListKey), QStringList()).toStringList();
-    const QStringList bak = settings()->value(QLatin1String(backupBakListKey), QStringList()).toStringList();
+    const QStringList org = settings()->value(QLatin1StringView(backupOrgListKey), QStringList()).toStringList();
+    const QStringList bak = settings()->value(QLatin1StringView(backupBakListKey), QStringList()).toStringList();
 
     QMap<QString, QString> map;
     const qsizetype orgCount = org.size();
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index 044ca16f8..485c97ad8 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -219,7 +219,7 @@ QDesignerWorkbench::QDesignerWorkbench()  :
     }
 
     restoreUISettings();
-    AppFontWidget::restore(m_core->settingsManager(), QLatin1String(appFontPrefixC));
+    AppFontWidget::restore(m_core->settingsManager(), QLatin1StringView(appFontPrefixC));
     m_state = StateUp;
 }
 
@@ -624,7 +624,7 @@ void QDesignerWorkbench::saveSettings() const
     QDesignerSettings settings(m_core);
     settings.clearBackup();
     saveGeometries(settings);
-    AppFontWidget::save(m_core->settingsManager(), QLatin1String(appFontPrefixC));
+    AppFontWidget::save(m_core->settingsManager(), QLatin1StringView(appFontPrefixC));
 }
 
 void QDesignerWorkbench::saveGeometries(QDesignerSettings &settings) const
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index b438a7b22..eacfe79fc 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -137,7 +137,7 @@ VersionDialog::VersionDialog(QWidget *parent)
     VersionLabel *label = new VersionLabel(this);
     QLabel *lbl = new QLabel(this);
     QString version = tr("<h3>%1</h3><br/><br/>Version %2");
-    version = version.arg(tr("Qt Designer")).arg(QLatin1String(QT_VERSION_STR));
+    version = version.arg(tr("Qt Designer")).arg(QLatin1StringView(QT_VERSION_STR));
     version.append(tr("<br/>Qt Designer is a graphical user interface designer for Qt applications.<br/>"));
 
     lbl->setText(tr("%1"
diff --git a/src/designer/src/lib/extension/extension.h b/src/designer/src/lib/extension/extension.h
index ab646f60b..e9c9e24bd 100644
--- a/src/designer/src/lib/extension/extension.h
+++ b/src/designer/src/lib/extension/extension.h
@@ -11,7 +11,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#define Q_TYPEID(IFace) QLatin1String(IFace##_iid)
+#define Q_TYPEID(IFace) QLatin1StringView(IFace##_iid)
 
 class QDESIGNER_EXTENSION_EXPORT QAbstractExtensionFactory
 {
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 24f3fbd8d..bc125fca3 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -388,7 +388,7 @@ void ActionEditor::setFilter(const QString &f)
 // Set changed state of icon property,  reset when icon is cleared
 static void refreshIconPropertyChanged(const QAction *action, QDesignerPropertySheetExtension *sheet)
 {
-    sheet->setChanged(sheet->indexOf(QLatin1String(iconPropertyC)), !action->icon().isNull());
+    sheet->setChanged(sheet->indexOf(QLatin1StringView(iconPropertyC)), !action->icon().isNull());
 }
 
 void ActionEditor::manageAction(QAction *action)
@@ -400,8 +400,8 @@ void ActionEditor::manageAction(QAction *action)
         return;
 
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), action);
-    sheet->setChanged(sheet->indexOf(QLatin1String(objectNamePropertyC)), true);
-    sheet->setChanged(sheet->indexOf(QLatin1String(textPropertyC)), true);
+    sheet->setChanged(sheet->indexOf(QLatin1StringView(objectNamePropertyC)), true);
+    sheet->setChanged(sheet->indexOf(QLatin1StringView(textPropertyC)), true);
     refreshIconPropertyChanged(action, sheet);
 
     m_actionView->setCurrentIndex(m_actionView->model()->addAction(action));
@@ -444,17 +444,17 @@ void ActionEditor::slotNewAction()
 
         QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), action);
         if (!actionData.toolTip.isEmpty())
-            setInitialProperty(sheet, QLatin1String(toolTipPropertyC), actionData.toolTip);
+            setInitialProperty(sheet, QLatin1StringView(toolTipPropertyC), actionData.toolTip);
 
         if (actionData.checkable)
-            setInitialProperty(sheet, QLatin1String(checkablePropertyC), QVariant(true));
+            setInitialProperty(sheet, QLatin1StringView(checkablePropertyC), QVariant(true));
 
         if (!actionData.keysequence.value().isEmpty())
-            setInitialProperty(sheet, QLatin1String(shortcutPropertyC), QVariant::fromValue(actionData.keysequence));
+            setInitialProperty(sheet, QLatin1StringView(shortcutPropertyC), QVariant::fromValue(actionData.keysequence));
 
-        sheet->setProperty(sheet->indexOf(QLatin1String(iconPropertyC)), QVariant::fromValue(actionData.icon));
+        sheet->setProperty(sheet->indexOf(QLatin1StringView(iconPropertyC)), QVariant::fromValue(actionData.icon));
 
-        setInitialProperty(sheet, QLatin1String(menuRolePropertyC), QVariant::fromValue(actionData.menuRole));
+        setInitialProperty(sheet, QLatin1StringView(menuRolePropertyC), QVariant::fromValue(actionData.menuRole));
 
         AddActionCommand *cmd = new AddActionCommand(formWindow());
         cmd->init(action);
@@ -467,7 +467,7 @@ void ActionEditor::slotNewAction()
 
 static QDesignerFormWindowCommand *setIconPropertyCommand(const PropertySheetIconValue &newIcon, QAction *action, QDesignerFormWindowInterface *fw)
 {
-    const QString iconProperty = QLatin1String(iconPropertyC);
+    const QString iconProperty = QLatin1StringView(iconPropertyC);
     if (newIcon.isEmpty()) {
         ResetPropertyCommand *cmd = new ResetPropertyCommand(fw);
         cmd->init(action, iconProperty);
@@ -483,7 +483,7 @@ static QDesignerFormWindowCommand *setIconPropertyCommand(const PropertySheetIco
 
 static QDesignerFormWindowCommand *setKeySequencePropertyCommand(const PropertySheetKeySequenceValue &ks, QAction *action, QDesignerFormWindowInterface *fw)
 {
-    const QString shortcutProperty = QLatin1String(shortcutPropertyC);
+    const QString shortcutProperty = QLatin1StringView(shortcutPropertyC);
     if (ks.value().isEmpty()) {
         ResetPropertyCommand *cmd = new ResetPropertyCommand(fw);
         cmd->init(action, shortcutProperty);
@@ -532,8 +532,8 @@ void ActionEditor::editAction(QAction *action, int column)
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), action);
     oldActionData.name = action->objectName();
     oldActionData.text = action->text();
-    oldActionData.toolTip = textPropertyValue(sheet, QLatin1String(toolTipPropertyC));
-    oldActionData.icon = qvariant_cast<PropertySheetIconValue>(sheet->property(sheet->indexOf(QLatin1String(iconPropertyC))));
+    oldActionData.toolTip = textPropertyValue(sheet, QLatin1StringView(toolTipPropertyC));
+    oldActionData.icon = qvariant_cast<PropertySheetIconValue>(sheet->property(sheet->indexOf(QLatin1StringView(iconPropertyC))));
     oldActionData.keysequence = ActionModel::actionShortCut(sheet);
     oldActionData.checkable =  action->isCheckable();
     oldActionData.menuRole.value = action->menuRole();
@@ -580,25 +580,25 @@ void ActionEditor::editAction(QAction *action, int column)
         fw->beginCommand(u"Edit action"_s);
 
     if (changeMask & ActionData::NameChanged)
-        undoStack->push(createTextPropertyCommand(QLatin1String(objectNamePropertyC), newActionData.name, action, fw));
+        undoStack->push(createTextPropertyCommand(QLatin1StringView(objectNamePropertyC), newActionData.name, action, fw));
 
     if (changeMask & ActionData::TextChanged)
-        undoStack->push(createTextPropertyCommand(QLatin1String(textPropertyC), newActionData.text, action, fw));
+        undoStack->push(createTextPropertyCommand(QLatin1StringView(textPropertyC), newActionData.text, action, fw));
 
     if (changeMask & ActionData::ToolTipChanged)
-        undoStack->push(createTextPropertyCommand(QLatin1String(toolTipPropertyC), newActionData.toolTip, action, fw));
+        undoStack->push(createTextPropertyCommand(QLatin1StringView(toolTipPropertyC), newActionData.toolTip, action, fw));
 
     if (changeMask & ActionData::IconChanged)
         undoStack->push(setIconPropertyCommand(newActionData.icon, action, fw));
 
     if (changeMask & ActionData::CheckableChanged)
-        undoStack->push(setPropertyCommand(QLatin1String(checkablePropertyC), newActionData.checkable, false, action, fw));
+        undoStack->push(setPropertyCommand(QLatin1StringView(checkablePropertyC), newActionData.checkable, false, action, fw));
 
     if (changeMask & ActionData::KeysequenceChanged)
         undoStack->push(setKeySequencePropertyCommand(newActionData.keysequence, action, fw));
 
     if (changeMask & ActionData::MenuRoleChanged)
-        undoStack->push(setPropertyCommand(QLatin1String(menuRolePropertyC), static_cast<QAction::MenuRole>(newActionData.menuRole.value), QAction::NoRole, action, fw));
+        undoStack->push(setPropertyCommand(QLatin1StringView(menuRolePropertyC), static_cast<QAction::MenuRole>(newActionData.menuRole.value), QAction::NoRole, action, fw));
 
     if (severalChanges)
         fw->endCommand();
@@ -733,7 +733,7 @@ void  ActionEditor::resourceImageDropped(const QString &path, QAction *action)
 
     QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), action);
     const PropertySheetIconValue oldIcon =
-            qvariant_cast<PropertySheetIconValue>(sheet->property(sheet->indexOf(QLatin1String(iconPropertyC))));
+            qvariant_cast<PropertySheetIconValue>(sheet->property(sheet->indexOf(QLatin1StringView(iconPropertyC))));
     PropertySheetIconValue newIcon;
     newIcon.setPixmap(QIcon::Normal, QIcon::Off, PropertySheetPixmapValue(path));
     if (newIcon.paths().isEmpty() || newIcon.paths() == oldIcon.paths())
@@ -790,14 +790,14 @@ void ActionEditor::slotSelectAssociatedWidget(QWidget *w)
 void ActionEditor::restoreSettings()
 {
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    m_actionView->setViewMode(settings->value(QLatin1String(actionEditorViewModeKey), 0).toInt());
+    m_actionView->setViewMode(settings->value(QLatin1StringView(actionEditorViewModeKey), 0).toInt());
     updateViewModeActions();
 }
 
 void ActionEditor::saveSettings()
 {
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    settings->setValue(QLatin1String(actionEditorViewModeKey), m_actionView->viewMode());
+    settings->setValue(QLatin1StringView(actionEditorViewModeKey), m_actionView->viewMode());
 }
 
 void ActionEditor::updateViewModeActions()
diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index 1fa1e0ebc..f42805236 100644
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -221,7 +221,7 @@ QMimeData *ActionModel::mimeData(const QModelIndexList &indexes ) const
 // Resource images are plain text. The drag needs to be restricted, however.
 QStringList ActionModel::mimeTypes() const
 {
-    return QStringList(QLatin1String(plainTextMimeType));
+    return QStringList(QLatin1StringView(plainTextMimeType));
 }
 
 QString ActionModel::actionName(int row) const
@@ -613,7 +613,7 @@ ActionRepositoryMimeData::ActionRepositoryMimeData(const ActionList &al, Qt::Dro
 
 QStringList ActionRepositoryMimeData::formats() const
 {
-    return QStringList(QLatin1String(actionMimeType));
+    return QStringList(QLatin1StringView(actionMimeType));
 }
 
 QPixmap  ActionRepositoryMimeData::actionDragPixmap(const QAction *action)
diff --git a/src/designer/src/lib/shared/deviceprofile.cpp b/src/designer/src/lib/shared/deviceprofile.cpp
index 25ac301c2..1a63037a9 100644
--- a/src/designer/src/lib/shared/deviceprofile.cpp
+++ b/src/designer/src/lib/shared/deviceprofile.cpp
@@ -282,20 +282,20 @@ QString DeviceProfile::toXml() const
     const DeviceProfileData &d = *m_d;
     QString rc;
     QXmlStreamWriter writer(&rc);
-    writer.writeStartDocument(QLatin1String(xmlVersionC));
-    writer.writeStartElement(QLatin1String(rootElementC));
-    writeElement(writer, QLatin1String(nameElementC), d.m_name);
+    writer.writeStartDocument(QLatin1StringView(xmlVersionC));
+    writer.writeStartElement(QLatin1StringView(rootElementC));
+    writeElement(writer, QLatin1StringView(nameElementC), d.m_name);
 
     if (!d.m_fontFamily.isEmpty())
-        writeElement(writer, QLatin1String(fontFamilyElementC), d.m_fontFamily);
+        writeElement(writer, QLatin1StringView(fontFamilyElementC), d.m_fontFamily);
     if (d.m_fontPointSize >= 0)
-        writeElement(writer, QLatin1String(fontPointSizeElementC), QString::number(d.m_fontPointSize));
+        writeElement(writer, QLatin1StringView(fontPointSizeElementC), QString::number(d.m_fontPointSize));
     if (d.m_dpiX > 0)
-        writeElement(writer, QLatin1String(dPIXElementC), QString::number(d.m_dpiX));
+        writeElement(writer, QLatin1StringView(dPIXElementC), QString::number(d.m_dpiX));
     if (d.m_dpiY > 0)
-        writeElement(writer, QLatin1String(dPIYElementC), QString::number(d.m_dpiY));
+        writeElement(writer, QLatin1StringView(dPIYElementC), QString::number(d.m_dpiY));
     if (!d.m_style.isEmpty())
-        writeElement(writer, QLatin1String(styleElementC), d.m_style);
+        writeElement(writer, QLatin1StringView(styleElementC), d.m_style);
 
     writer.writeEndElement();
     writer.writeEndDocument();
@@ -311,7 +311,7 @@ static ParseStage nextStage(ParseStage currentStage, QStringView startElement)
 {
     switch (currentStage) {
     case ParseBeginning:
-        if (startElement == QLatin1String(rootElementC))
+        if (startElement == QLatin1StringView(rootElementC))
             return ParseWithinRoot;
         break;
     case ParseWithinRoot:
@@ -321,17 +321,17 @@ static ParseStage nextStage(ParseStage currentStage, QStringView startElement)
     case ParseDPIX:
     case ParseDPIY:
     case ParseStyle:
-        if (startElement == QLatin1String(nameElementC))
+        if (startElement == QLatin1StringView(nameElementC))
             return ParseName;
-        if (startElement == QLatin1String(fontFamilyElementC))
+        if (startElement == QLatin1StringView(fontFamilyElementC))
             return ParseFontFamily;
-        if (startElement == QLatin1String(fontPointSizeElementC))
+        if (startElement == QLatin1StringView(fontPointSizeElementC))
             return ParseFontPointSize;
-        if (startElement == QLatin1String(dPIXElementC))
+        if (startElement == QLatin1StringView(dPIXElementC))
             return ParseDPIX;
-        if (startElement == QLatin1String(dPIYElementC))
+        if (startElement == QLatin1StringView(dPIYElementC))
             return ParseDPIY;
-        if (startElement == QLatin1String(styleElementC))
+        if (startElement == QLatin1StringView(styleElementC))
             return ParseStyle;
         break;
     case ParseError:
diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp
index 775821269..2129faa21 100644
--- a/src/designer/src/lib/shared/formlayoutmenu.cpp
+++ b/src/designer/src/lib/shared/formlayoutmenu.cpp
@@ -335,7 +335,7 @@ QStringList FormLayoutRowDialog::fieldWidgetClasses(QDesignerFormEditorInterface
         // Turn known base classes into list
         QStringList baseClasses;
         for (auto fw : fieldWidgetBaseClasses)
-            baseClasses.append(QLatin1String(fw));
+            baseClasses.append(QLatin1StringView(fw));
         // Scan for custom widgets that inherit them and store them in a
         // multimap of base class->custom widgets unless we have a language
         // extension installed which might do funny things with custom widgets.
@@ -426,7 +426,7 @@ static void addFormLayoutRow(const FormLayoutRow &formLayoutRow, int row, QWidge
     undoStack->push(controlCmd);
     if (formLayoutRow.buddy) {
         SetPropertyCommand *buddyCommand = new SetPropertyCommand(formWindow);
-        buddyCommand->init(widgetPair.first, QLatin1String(buddyPropertyC), widgetPair.second->objectName());
+        buddyCommand->init(widgetPair.first, QLatin1StringView(buddyPropertyC), widgetPair.second->objectName());
         undoStack->push(buddyCommand);
     }
     undoStack->endMacro();
diff --git a/src/designer/src/lib/shared/grid.cpp b/src/designer/src/lib/shared/grid.cpp
index ab36fcbf6..8d8fe8585 100644
--- a/src/designer/src/lib/shared/grid.cpp
+++ b/src/designer/src/lib/shared/grid.cpp
@@ -56,11 +56,11 @@ Grid::Grid() :
 bool Grid::fromVariantMap(const QVariantMap& vm)
 {
     Grid grid;
-    bool anyData = valueFromVariantMap(vm, QLatin1String(KEY_VISIBLE), grid.m_visible);
-    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_SNAPX), grid.m_snapX);
-    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_SNAPY), grid.m_snapY);
-    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_DELTAX), grid.m_deltaX);
-    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_DELTAY), grid.m_deltaY);
+    bool anyData = valueFromVariantMap(vm, QLatin1StringView(KEY_VISIBLE), grid.m_visible);
+    anyData |= valueFromVariantMap(vm, QLatin1StringView(KEY_SNAPX), grid.m_snapX);
+    anyData |= valueFromVariantMap(vm, QLatin1StringView(KEY_SNAPY), grid.m_snapY);
+    anyData |= valueFromVariantMap(vm, QLatin1StringView(KEY_DELTAX), grid.m_deltaX);
+    anyData |= valueFromVariantMap(vm, QLatin1StringView(KEY_DELTAY), grid.m_deltaY);
     if (!anyData)
         return false;
     if (grid.m_deltaX == 0 || grid.m_deltaY == 0) {
@@ -80,11 +80,11 @@ QVariantMap Grid::toVariantMap(bool forceKeys) const
 
 void  Grid::addToVariantMap(QVariantMap& vm, bool forceKeys) const
 {
-    valueToVariantMap(m_visible, defaultVisible, QLatin1String(KEY_VISIBLE), vm, forceKeys);
-    valueToVariantMap(m_snapX, defaultSnap, QLatin1String(KEY_SNAPX), vm, forceKeys);
-    valueToVariantMap(m_snapY, defaultSnap, QLatin1String(KEY_SNAPY), vm, forceKeys);
-    valueToVariantMap(m_deltaX, DEFAULT_GRID, QLatin1String(KEY_DELTAX), vm, forceKeys);
-    valueToVariantMap(m_deltaY, DEFAULT_GRID, QLatin1String(KEY_DELTAY), vm, forceKeys);
+    valueToVariantMap(m_visible, defaultVisible, QLatin1StringView(KEY_VISIBLE), vm, forceKeys);
+    valueToVariantMap(m_snapX, defaultSnap, QLatin1StringView(KEY_SNAPX), vm, forceKeys);
+    valueToVariantMap(m_snapY, defaultSnap, QLatin1StringView(KEY_SNAPY), vm, forceKeys);
+    valueToVariantMap(m_deltaX, DEFAULT_GRID, QLatin1StringView(KEY_DELTAX), vm, forceKeys);
+    valueToVariantMap(m_deltaY, DEFAULT_GRID, QLatin1StringView(KEY_DELTAY), vm, forceKeys);
 }
 
 void Grid::paint(QWidget *widget, QPaintEvent *e) const
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index cbfafdf0a..104408d0b 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -51,7 +51,7 @@ static const char *newFormObjectNameC = "Form";
 static QString formName(const QString &className)
 {
     if (!className.startsWith(u'Q'))
-        return QLatin1String(newFormObjectNameC);
+        return QLatin1StringView(newFormObjectNameC);
     QString rc = className;
     rc.remove(0, 1);
     return rc;
diff --git a/src/designer/src/lib/shared/plaintexteditor.cpp b/src/designer/src/lib/shared/plaintexteditor.cpp
index d3c8f6ecc..1f61ce380 100644
--- a/src/designer/src/lib/shared/plaintexteditor.cpp
+++ b/src/designer/src/lib/shared/plaintexteditor.cpp
@@ -37,9 +37,9 @@ PlainTextEditorDialog::PlainTextEditorDialog(QDesignerFormEditorInterface *core,
     vlayout->addWidget(buttonBox);
 
     QDesignerSettingsInterface *settings = core->settingsManager();
-    settings->beginGroup(QLatin1String(PlainTextDialogC));
+    settings->beginGroup(QLatin1StringView(PlainTextDialogC));
 
-    if (settings->contains(QLatin1String(PlainTextEditorGeometryC)))
+    if (settings->contains(QLatin1StringView(PlainTextEditorGeometryC)))
         restoreGeometry(settings->value(QLatin1StringView(PlainTextEditorGeometryC)).toByteArray());
 
     settings->endGroup();
@@ -48,7 +48,7 @@ PlainTextEditorDialog::PlainTextEditorDialog(QDesignerFormEditorInterface *core,
 PlainTextEditorDialog::~PlainTextEditorDialog()
 {
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    settings->beginGroup(QLatin1String(PlainTextDialogC));
+    settings->beginGroup(QLatin1StringView(PlainTextDialogC));
 
     settings->setValue(QLatin1StringView(PlainTextEditorGeometryC), saveGeometry());
     settings->endGroup();
diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp
index 5f824853f..e03d5b149 100644
--- a/src/designer/src/lib/shared/pluginmanager.cpp
+++ b/src/designer/src/lib/shared/pluginmanager.cpp
@@ -89,7 +89,7 @@ static inline QString getDesignerLanguage(QDesignerFormEditorInterface *core)
 {
     if (QDesignerLanguageExtension *lang = qt_extension<QDesignerLanguageExtension *>(core->extensionManager(), core)) {
         if (lang->uiExtension() == "jui"_L1)
-            return QLatin1String(jambiLanguageC);
+            return QLatin1StringView(jambiLanguageC);
         return u"unknown"_s;
     }
     return u"c++"_s;
@@ -259,12 +259,12 @@ static bool parsePropertySpecs(QXmlStreamReader &sr,
                                QDesignerCustomWidgetSharedData *data,
                                QString *errorMessage)
 {
-    const QString propertySpecs = QLatin1String(propertySpecsC);
-    const QString stringPropertySpec = QLatin1String(stringPropertySpecC);
-    const QString propertyToolTip = QLatin1String(propertyToolTipC);
-    const QString stringPropertyTypeAttr = QLatin1String(stringPropertyTypeAttrC);
-    const QString stringPropertyNoTrAttr = QLatin1String(stringPropertyNoTrAttrC);
-    const QString stringPropertyNameAttr = QLatin1String(stringPropertyNameAttrC);
+    const QString propertySpecs = QLatin1StringView(propertySpecsC);
+    const QString stringPropertySpec = QLatin1StringView(stringPropertySpecC);
+    const QString propertyToolTip = QLatin1StringView(propertyToolTipC);
+    const QString stringPropertyTypeAttr = QLatin1StringView(stringPropertyTypeAttrC);
+    const QString stringPropertyNoTrAttr = QLatin1StringView(stringPropertyNoTrAttrC);
+    const QString stringPropertyNameAttr = QLatin1StringView(stringPropertyNameAttrC);
 
     while (!sr.atEnd()) {
         switch(sr.readNext()) {
@@ -330,8 +330,8 @@ QDesignerCustomWidgetData::ParseResult
     ParseResult rc = ParseOk;
     // Parse for the (optional) <ui> or the first <widget> element
     QStringList elements;
-    elements.push_back(QLatin1String(uiElementC));
-    elements.push_back(QLatin1String(widgetElementC));
+    elements.push_back(QLatin1StringView(uiElementC));
+    elements.push_back(QLatin1StringView(widgetElementC));
     for (int i = 0; i < 2 && !foundWidget; i++) {
         switch (findElement(elements, sr)) {
         case FindError:
@@ -342,13 +342,13 @@ QDesignerCustomWidgetData::ParseResult
             return ParseError;
         case 0: { // <ui>
             const QXmlStreamAttributes attributes = sr.attributes();
-            data.xmlLanguage = attributes.value(QLatin1String(languageAttributeC)).toString();
-            data.xmlDisplayName = attributes.value(QLatin1String(displayNameAttributeC)).toString();
+            data.xmlLanguage = attributes.value(QLatin1StringView(languageAttributeC)).toString();
+            data.xmlDisplayName = attributes.value(QLatin1StringView(displayNameAttributeC)).toString();
             foundUI = true;
         }
             break;
         case 1: // <widget>: Do some sanity checks
-            data.xmlClassName = sr.attributes().value(QLatin1String(classAttributeC)).toString();
+            data.xmlClassName = sr.attributes().value(QLatin1StringView(classAttributeC)).toString();
             if (data.xmlClassName.isEmpty()) {
                 *errorMessage = QDesignerPluginManager::tr("The class attribute for the class %1 is missing.").arg(name);
                 rc = ParseWarning;
@@ -366,7 +366,7 @@ QDesignerCustomWidgetData::ParseResult
     if (!foundUI)
         return rc;
     elements.clear();
-    elements.push_back(QLatin1String(customwidgetElementC));
+    elements.push_back(QLatin1StringView(customwidgetElementC));
     switch (findElement(elements, sr)) {
     case FindError:
         *errorMessage = msgXmlError(name, sr.errorString());
@@ -378,9 +378,9 @@ QDesignerCustomWidgetData::ParseResult
     }
     // Find <extends>, <addPageMethod>, <stringproperties>
     elements.clear();
-    elements.push_back(QLatin1String(extendsElementC));
-    elements.push_back(QLatin1String(addPageMethodC));
-    elements.push_back(QLatin1String(propertySpecsC));
+    elements.push_back(QLatin1StringView(extendsElementC));
+    elements.push_back(QLatin1StringView(addPageMethodC));
+    elements.push_back(QLatin1StringView(propertySpecsC));
     while (true) {
         switch (findElement(elements, sr)) {
         case FindError:
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index b4c03a3b7..d565397eb 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -41,7 +41,7 @@ enum { SkinComboNoneIndex = 0 };
 static const Skins &defaultSkins() {
     static Skins rc;
     if (rc.isEmpty()) {
-        const QString skinPath = QLatin1String(skinResourcePathC);
+        const QString skinPath = QLatin1StringView(skinResourcePathC);
         const QString pattern = "*."_L1 + QLatin1StringView(skinExtensionC);
         const QDir dir(skinPath, pattern);
         const QFileInfoList list = dir.entryInfoList(QDir::Dirs|QDir::NoDotAndDotDot, QDir::Name);
@@ -241,7 +241,7 @@ int  PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::browseSkin()
     dlg.setOption(QFileDialog::ShowDirsOnly);
     const QString title = tr("Load Custom Device Skin");
     dlg.setWindowTitle(title);
-    dlg.setNameFilter(tr("All QVFB Skins (*.%1)").arg(QLatin1String(skinExtensionC)));
+    dlg.setNameFilter(tr("All QVFB Skins (*.%1)").arg(QLatin1StringView(skinExtensionC)));
 
     int rc = m_lastSkinIndex;
     do {
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index e86d6a8f9..1693b88e5 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -477,9 +477,9 @@ void PreviewConfiguration::toSettings(const QString &prefix, QDesignerSettingsIn
 {
     const PreviewConfigurationData &d = *m_d;
     settings->beginGroup(prefix);
-    settings->setValue(QLatin1String(styleKey),  d.m_style);
-    settings->setValue(QLatin1String(appStyleSheetKey), d.m_applicationStyleSheet);
-    settings->setValue(QLatin1String(skinKey), d.m_deviceSkin);
+    settings->setValue(QLatin1StringView(styleKey),  d.m_style);
+    settings->setValue(QLatin1StringView(appStyleSheetKey), d.m_applicationStyleSheet);
+    settings->setValue(QLatin1StringView(skinKey), d.m_deviceSkin);
     settings->endGroup();
 }
 
@@ -493,13 +493,13 @@ void PreviewConfiguration::fromSettings(const QString &prefix, const QDesignerSe
 
     const QVariant emptyString = QVariant(QString());
 
-    key += QLatin1String(styleKey);
+    key += QLatin1StringView(styleKey);
     d.m_style = settings->value(key, emptyString).toString();
 
-    key.replace(prefixSize, key.size() - prefixSize, QLatin1String(appStyleSheetKey));
+    key.replace(prefixSize, key.size() - prefixSize, QLatin1StringView(appStyleSheetKey));
     d.m_applicationStyleSheet = settings->value(key, emptyString).toString();
 
-    key.replace(prefixSize, key.size() - prefixSize, QLatin1String(skinKey));
+    key.replace(prefixSize, key.size() - prefixSize, QLatin1StringView(skinKey));
     d.m_deviceSkin = settings->value(key, emptyString).toString();
 }
 
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
index d64217757..71bc5873e 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -631,7 +631,7 @@ QDesignerPropertySheet::QDesignerPropertySheet(QObject *object, QObject *parent)
             const int fakeLayoutPropertyCount = sizeof(fakeLayoutProperties)/sizeof(const char*);
             const int size = count();
             for (int i = 0; i < fakeLayoutPropertyCount; i++) {
-                createFakeProperty(QLatin1String(fakeLayoutProperties[i]), 0);
+                createFakeProperty(QLatin1StringView(fakeLayoutProperties[i]), 0);
                 setAttribute(size  + i, true);
                 setPropertyGroup(size  + i, layoutGroup);
             }
diff --git a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
index d24847d08..2034aa749 100644
--- a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
+++ b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
@@ -319,19 +319,19 @@ QStackedWidgetPropertySheet::QStackedWidgetPropertySheet(QStackedWidget *object,
     QDesignerPropertySheet(object, parent),
     m_stackedWidget(object)
 {
-    createFakeProperty(QLatin1String(pagePropertyName), QString());
+    createFakeProperty(QLatin1StringView(pagePropertyName), QString());
 }
 
 bool QStackedWidgetPropertySheet::isEnabled(int index) const
 {
-    if (propertyName(index) != QLatin1String(pagePropertyName))
+    if (propertyName(index) != QLatin1StringView(pagePropertyName))
         return QDesignerPropertySheet::isEnabled(index);
     return  m_stackedWidget->currentWidget() != nullptr;
 }
 
 void QStackedWidgetPropertySheet::setProperty(int index, const QVariant &value)
 {
-    if (propertyName(index) == QLatin1String(pagePropertyName)) {
+    if (propertyName(index) == QLatin1StringView(pagePropertyName)) {
         if (QWidget *w = m_stackedWidget->currentWidget())
             w->setObjectName(value.toString());
     } else {
@@ -341,7 +341,7 @@ void QStackedWidgetPropertySheet::setProperty(int index, const QVariant &value)
 
 QVariant QStackedWidgetPropertySheet::property(int index) const
 {
-    if (propertyName(index) == QLatin1String(pagePropertyName)) {
+    if (propertyName(index) == QLatin1StringView(pagePropertyName)) {
         if (const QWidget *w = m_stackedWidget->currentWidget())
             return w->objectName();
         return QString();
@@ -351,7 +351,7 @@ QVariant QStackedWidgetPropertySheet::property(int index) const
 
 bool QStackedWidgetPropertySheet::reset(int index)
 {
-    if (propertyName(index) == QLatin1String(pagePropertyName)) {
+    if (propertyName(index) == QLatin1StringView(pagePropertyName)) {
         setProperty(index, QString());
         return true;
     }
@@ -360,7 +360,7 @@ bool QStackedWidgetPropertySheet::reset(int index)
 
 bool QStackedWidgetPropertySheet::checkProperty(const QString &propertyName)
 {
-    return propertyName != QLatin1String(pagePropertyName);
+    return propertyName != QLatin1StringView(pagePropertyName);
 }
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
index 060bc5f99..25030cfae 100644
--- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
+++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
@@ -369,15 +369,15 @@ QTabWidgetPropertySheet::QTabWidgetPropertySheet(QTabWidget *object, QObject *pa
     QDesignerPropertySheet(object, parent),
     m_tabWidget(object)
 {
-    createFakeProperty(QLatin1String(currentTabTextKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
-    createFakeProperty(QLatin1String(currentTabNameKey), QString());
-    createFakeProperty(QLatin1String(currentTabIconKey), QVariant::fromValue(qdesigner_internal::PropertySheetIconValue()));
+    createFakeProperty(QLatin1StringView(currentTabTextKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
+    createFakeProperty(QLatin1StringView(currentTabNameKey), QString());
+    createFakeProperty(QLatin1StringView(currentTabIconKey), QVariant::fromValue(qdesigner_internal::PropertySheetIconValue()));
     if (formWindowBase())
-        formWindowBase()->addReloadableProperty(this, indexOf(QLatin1String(currentTabIconKey)));
-    createFakeProperty(QLatin1String(currentTabToolTipKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
-    createFakeProperty(QLatin1String(currentTabWhatsThisKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
+        formWindowBase()->addReloadableProperty(this, indexOf(QLatin1StringView(currentTabIconKey)));
+    createFakeProperty(QLatin1StringView(currentTabToolTipKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
+    createFakeProperty(QLatin1StringView(currentTabWhatsThisKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
     // Prevent the tab widget's drag and drop handling from interfering with Designer's
-    createFakeProperty(QLatin1String(tabMovableKey), QVariant(false));
+    createFakeProperty(QLatin1StringView(tabMovableKey), QVariant(false));
 }
 
 QTabWidgetPropertySheet::TabWidgetProperty QTabWidgetPropertySheet::tabWidgetPropertyFromName(const QString &name)
@@ -385,11 +385,11 @@ QTabWidgetPropertySheet::TabWidgetProperty QTabWidgetPropertySheet::tabWidgetPro
     using TabWidgetPropertyHash = QHash<QString, TabWidgetProperty>;
     static TabWidgetPropertyHash tabWidgetPropertyHash;
     if (tabWidgetPropertyHash.isEmpty()) {
-        tabWidgetPropertyHash.insert(QLatin1String(currentTabTextKey),      PropertyCurrentTabText);
-        tabWidgetPropertyHash.insert(QLatin1String(currentTabNameKey),      PropertyCurrentTabName);
-        tabWidgetPropertyHash.insert(QLatin1String(currentTabIconKey),      PropertyCurrentTabIcon);
-        tabWidgetPropertyHash.insert(QLatin1String(currentTabToolTipKey),   PropertyCurrentTabToolTip);
-        tabWidgetPropertyHash.insert(QLatin1String(currentTabWhatsThisKey), PropertyCurrentTabWhatsThis);
+        tabWidgetPropertyHash.insert(QLatin1StringView(currentTabTextKey),      PropertyCurrentTabText);
+        tabWidgetPropertyHash.insert(QLatin1StringView(currentTabNameKey),      PropertyCurrentTabName);
+        tabWidgetPropertyHash.insert(QLatin1StringView(currentTabIconKey),      PropertyCurrentTabIcon);
+        tabWidgetPropertyHash.insert(QLatin1StringView(currentTabToolTipKey),   PropertyCurrentTabToolTip);
+        tabWidgetPropertyHash.insert(QLatin1StringView(currentTabWhatsThisKey), PropertyCurrentTabWhatsThis);
     }
     return tabWidgetPropertyHash.value(name, PropertyTabWidgetNone);
 }
diff --git a/src/designer/src/lib/shared/qdesigner_toolbox.cpp b/src/designer/src/lib/shared/qdesigner_toolbox.cpp
index ca70da1b9..de1c12143 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbox.cpp
+++ b/src/designer/src/lib/shared/qdesigner_toolbox.cpp
@@ -220,13 +220,13 @@ QToolBoxWidgetPropertySheet::QToolBoxWidgetPropertySheet(QToolBox *object, QObje
     QDesignerPropertySheet(object, parent),
     m_toolBox(object)
 {
-    createFakeProperty(QLatin1String(currentItemTextKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
-    createFakeProperty(QLatin1String(currentItemNameKey), QString());
-    createFakeProperty(QLatin1String(currentItemIconKey), QVariant::fromValue(qdesigner_internal::PropertySheetIconValue()));
+    createFakeProperty(QLatin1StringView(currentItemTextKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
+    createFakeProperty(QLatin1StringView(currentItemNameKey), QString());
+    createFakeProperty(QLatin1StringView(currentItemIconKey), QVariant::fromValue(qdesigner_internal::PropertySheetIconValue()));
     if (formWindowBase())
-        formWindowBase()->addReloadableProperty(this, indexOf(QLatin1String(currentItemIconKey)));
-    createFakeProperty(QLatin1String(currentItemToolTipKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
-    createFakeProperty(QLatin1String(tabSpacingKey), QVariant(tabSpacingDefault));
+        formWindowBase()->addReloadableProperty(this, indexOf(QLatin1StringView(currentItemIconKey)));
+    createFakeProperty(QLatin1StringView(currentItemToolTipKey), QVariant::fromValue(qdesigner_internal::PropertySheetStringValue()));
+    createFakeProperty(QLatin1StringView(tabSpacingKey), QVariant(tabSpacingDefault));
 }
 
 QToolBoxWidgetPropertySheet::ToolBoxProperty QToolBoxWidgetPropertySheet::toolBoxPropertyFromName(const QString &name)
@@ -234,11 +234,11 @@ QToolBoxWidgetPropertySheet::ToolBoxProperty QToolBoxWidgetPropertySheet::toolBo
     using ToolBoxPropertyHash = QHash<QString, ToolBoxProperty>;
     static ToolBoxPropertyHash toolBoxPropertyHash;
     if (toolBoxPropertyHash.isEmpty()) {
-        toolBoxPropertyHash.insert(QLatin1String(currentItemTextKey),    PropertyCurrentItemText);
-        toolBoxPropertyHash.insert(QLatin1String(currentItemNameKey),    PropertyCurrentItemName);
-        toolBoxPropertyHash.insert(QLatin1String(currentItemIconKey),    PropertyCurrentItemIcon);
-        toolBoxPropertyHash.insert(QLatin1String(currentItemToolTipKey), PropertyCurrentItemToolTip);
-        toolBoxPropertyHash.insert(QLatin1String(tabSpacingKey),         PropertyTabSpacing);
+        toolBoxPropertyHash.insert(QLatin1StringView(currentItemTextKey),    PropertyCurrentItemText);
+        toolBoxPropertyHash.insert(QLatin1StringView(currentItemNameKey),    PropertyCurrentItemName);
+        toolBoxPropertyHash.insert(QLatin1StringView(currentItemIconKey),    PropertyCurrentItemIcon);
+        toolBoxPropertyHash.insert(QLatin1StringView(currentItemToolTipKey), PropertyCurrentItemToolTip);
+        toolBoxPropertyHash.insert(QLatin1StringView(tabSpacingKey),         PropertyTabSpacing);
     }
     return toolBoxPropertyHash.value(name, PropertyToolBoxNone);
 }
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index 465434737..e24b6d872 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -292,7 +292,7 @@ int LayoutProperties::fromPropertySheet(const QDesignerFormEditorInterface *core
     Q_ASSERT(sheet);
     // name
     if (mask & ObjectNameProperty) {
-        const int nameIndex = sheet->indexOf(QLatin1String(objectNameC));
+        const int nameIndex = sheet->indexOf(QLatin1StringView(objectNameC));
         Q_ASSERT(nameIndex != -1);
         m_objectName = sheet->property(nameIndex);
         m_objectNameChanged =  sheet->isChanged(nameIndex);
@@ -302,25 +302,25 @@ int LayoutProperties::fromPropertySheet(const QDesignerFormEditorInterface *core
     const int marginFlags[MarginCount] = { LeftMarginProperty, TopMarginProperty, RightMarginProperty, BottomMarginProperty};
     for (int i = 0; i < MarginCount; i++)
         if (mask & marginFlags[i])
-            if (intValueFromSheet(sheet, QLatin1String(marginPropertyNamesC[i]), m_margins + i, m_marginsChanged + i))
+            if (intValueFromSheet(sheet, QLatin1StringView(marginPropertyNamesC[i]), m_margins + i, m_marginsChanged + i))
                 rc |= marginFlags[i];
 
     const int spacingFlags[] = { SpacingProperty, HorizSpacingProperty, VertSpacingProperty};
     for (int i = 0; i < SpacingsCount; i++)
         if (mask & spacingFlags[i])
-            if (intValueFromSheet(sheet, QLatin1String(spacingPropertyNamesC[i]), m_spacings + i, m_spacingsChanged + i))
+            if (intValueFromSheet(sheet, QLatin1StringView(spacingPropertyNamesC[i]), m_spacings + i, m_spacingsChanged + i))
                 rc |= spacingFlags[i];
     // sizeConstraint, flags
-    variantPropertyFromSheet(mask, SizeConstraintProperty, sheet, QLatin1String(sizeConstraintC), &m_sizeConstraint, &m_sizeConstraintChanged, &rc);
-    variantPropertyFromSheet(mask, FieldGrowthPolicyProperty, sheet, QLatin1String(fieldGrowthPolicyPropertyC), &m_fieldGrowthPolicy, &m_fieldGrowthPolicyChanged, &rc);
-    variantPropertyFromSheet(mask, RowWrapPolicyProperty, sheet, QLatin1String(rowWrapPolicyPropertyC), &m_rowWrapPolicy, &m_rowWrapPolicyChanged, &rc);
-    variantPropertyFromSheet(mask, LabelAlignmentProperty, sheet, QLatin1String(labelAlignmentPropertyC), &m_labelAlignment, &m_labelAlignmentChanged, &rc);
-    variantPropertyFromSheet(mask, FormAlignmentProperty, sheet, QLatin1String(formAlignmentPropertyC), &m_formAlignment, &m_formAlignmentChanged, &rc);
-    variantPropertyFromSheet(mask, BoxStretchProperty, sheet, QLatin1String(boxStretchPropertyC), &m_boxStretch, & m_boxStretchChanged, &rc);
-    variantPropertyFromSheet(mask, GridRowStretchProperty, sheet, QLatin1String(gridRowStretchPropertyC), &m_gridRowStretch, &m_gridRowStretchChanged, &rc);
-    variantPropertyFromSheet(mask, GridColumnStretchProperty, sheet, QLatin1String(gridColumnStretchPropertyC), &m_gridColumnStretch, &m_gridColumnStretchChanged, &rc);
-    variantPropertyFromSheet(mask, GridRowMinimumHeightProperty, sheet, QLatin1String(gridRowMinimumHeightPropertyC), &m_gridRowMinimumHeight, &m_gridRowMinimumHeightChanged, &rc);
-    variantPropertyFromSheet(mask, GridColumnMinimumWidthProperty, sheet, QLatin1String(gridColumnMinimumWidthPropertyC), &m_gridColumnMinimumWidth, &m_gridColumnMinimumWidthChanged, &rc);
+    variantPropertyFromSheet(mask, SizeConstraintProperty, sheet, QLatin1StringView(sizeConstraintC), &m_sizeConstraint, &m_sizeConstraintChanged, &rc);
+    variantPropertyFromSheet(mask, FieldGrowthPolicyProperty, sheet, QLatin1StringView(fieldGrowthPolicyPropertyC), &m_fieldGrowthPolicy, &m_fieldGrowthPolicyChanged, &rc);
+    variantPropertyFromSheet(mask, RowWrapPolicyProperty, sheet, QLatin1StringView(rowWrapPolicyPropertyC), &m_rowWrapPolicy, &m_rowWrapPolicyChanged, &rc);
+    variantPropertyFromSheet(mask, LabelAlignmentProperty, sheet, QLatin1StringView(labelAlignmentPropertyC), &m_labelAlignment, &m_labelAlignmentChanged, &rc);
+    variantPropertyFromSheet(mask, FormAlignmentProperty, sheet, QLatin1StringView(formAlignmentPropertyC), &m_formAlignment, &m_formAlignmentChanged, &rc);
+    variantPropertyFromSheet(mask, BoxStretchProperty, sheet, QLatin1StringView(boxStretchPropertyC), &m_boxStretch, & m_boxStretchChanged, &rc);
+    variantPropertyFromSheet(mask, GridRowStretchProperty, sheet, QLatin1StringView(gridRowStretchPropertyC), &m_gridRowStretch, &m_gridRowStretchChanged, &rc);
+    variantPropertyFromSheet(mask, GridColumnStretchProperty, sheet, QLatin1StringView(gridColumnStretchPropertyC), &m_gridColumnStretch, &m_gridColumnStretchChanged, &rc);
+    variantPropertyFromSheet(mask, GridRowMinimumHeightProperty, sheet, QLatin1StringView(gridRowMinimumHeightPropertyC), &m_gridRowMinimumHeight, &m_gridRowMinimumHeightChanged, &rc);
+    variantPropertyFromSheet(mask, GridColumnMinimumWidthProperty, sheet, QLatin1StringView(gridColumnMinimumWidthPropertyC), &m_gridColumnMinimumWidth, &m_gridColumnMinimumWidthChanged, &rc);
     return rc;
 }
 
@@ -360,7 +360,7 @@ int LayoutProperties::toPropertySheet(const QDesignerFormEditorInterface *core,
     Q_ASSERT(sheet);
     // name
     if (mask & ObjectNameProperty) {
-        const int nameIndex = sheet->indexOf(QLatin1String(objectNameC));
+        const int nameIndex = sheet->indexOf(QLatin1StringView(objectNameC));
         Q_ASSERT(nameIndex != -1);
         sheet->setProperty(nameIndex, m_objectName);
         if (applyChanged)
@@ -371,25 +371,25 @@ int LayoutProperties::toPropertySheet(const QDesignerFormEditorInterface *core,
     const int marginFlags[MarginCount] = { LeftMarginProperty, TopMarginProperty, RightMarginProperty, BottomMarginProperty};
     for (int i = 0; i < MarginCount; i++)
         if (mask & marginFlags[i])
-            if (intValueToSheet(sheet, QLatin1String(marginPropertyNamesC[i]), m_margins[i], m_marginsChanged[i], applyChanged))
+            if (intValueToSheet(sheet, QLatin1StringView(marginPropertyNamesC[i]), m_margins[i], m_marginsChanged[i], applyChanged))
                 rc |= marginFlags[i];
 
     const int spacingFlags[] = { SpacingProperty, HorizSpacingProperty, VertSpacingProperty};
     for (int i = 0; i < SpacingsCount; i++)
         if (mask & spacingFlags[i])
-            if (intValueToSheet(sheet, QLatin1String(spacingPropertyNamesC[i]), m_spacings[i], m_spacingsChanged[i], applyChanged))
+            if (intValueToSheet(sheet, QLatin1StringView(spacingPropertyNamesC[i]), m_spacings[i], m_spacingsChanged[i], applyChanged))
                 rc |= spacingFlags[i];
     // sizeConstraint
-    variantPropertyToSheet(mask, SizeConstraintProperty, applyChanged, sheet, QLatin1String(sizeConstraintC), m_sizeConstraint, m_sizeConstraintChanged, &rc);
-    variantPropertyToSheet(mask, FieldGrowthPolicyProperty, applyChanged, sheet, QLatin1String(fieldGrowthPolicyPropertyC), m_fieldGrowthPolicy, m_fieldGrowthPolicyChanged, &rc);
-    variantPropertyToSheet(mask, RowWrapPolicyProperty, applyChanged, sheet, QLatin1String(rowWrapPolicyPropertyC), m_rowWrapPolicy, m_rowWrapPolicyChanged, &rc);
-    variantPropertyToSheet(mask, LabelAlignmentProperty, applyChanged, sheet, QLatin1String(labelAlignmentPropertyC), m_labelAlignment, m_labelAlignmentChanged, &rc);
-    variantPropertyToSheet(mask, FormAlignmentProperty, applyChanged, sheet, QLatin1String(formAlignmentPropertyC), m_formAlignment, m_formAlignmentChanged, &rc);
-    variantPropertyToSheet(mask, BoxStretchProperty, applyChanged, sheet, QLatin1String(boxStretchPropertyC), m_boxStretch, m_boxStretchChanged, &rc);
-    variantPropertyToSheet(mask, GridRowStretchProperty, applyChanged, sheet, QLatin1String(gridRowStretchPropertyC), m_gridRowStretch, m_gridRowStretchChanged, &rc);
-    variantPropertyToSheet(mask, GridColumnStretchProperty, applyChanged, sheet, QLatin1String(gridColumnStretchPropertyC), m_gridColumnStretch, m_gridColumnStretchChanged, &rc);
-    variantPropertyToSheet(mask, GridRowMinimumHeightProperty, applyChanged, sheet, QLatin1String(gridRowMinimumHeightPropertyC), m_gridRowMinimumHeight, m_gridRowMinimumHeightChanged, &rc);
-    variantPropertyToSheet(mask, GridColumnMinimumWidthProperty, applyChanged, sheet, QLatin1String(gridColumnMinimumWidthPropertyC), m_gridColumnMinimumWidth, m_gridColumnMinimumWidthChanged, &rc);
+    variantPropertyToSheet(mask, SizeConstraintProperty, applyChanged, sheet, QLatin1StringView(sizeConstraintC), m_sizeConstraint, m_sizeConstraintChanged, &rc);
+    variantPropertyToSheet(mask, FieldGrowthPolicyProperty, applyChanged, sheet, QLatin1StringView(fieldGrowthPolicyPropertyC), m_fieldGrowthPolicy, m_fieldGrowthPolicyChanged, &rc);
+    variantPropertyToSheet(mask, RowWrapPolicyProperty, applyChanged, sheet, QLatin1StringView(rowWrapPolicyPropertyC), m_rowWrapPolicy, m_rowWrapPolicyChanged, &rc);
+    variantPropertyToSheet(mask, LabelAlignmentProperty, applyChanged, sheet, QLatin1StringView(labelAlignmentPropertyC), m_labelAlignment, m_labelAlignmentChanged, &rc);
+    variantPropertyToSheet(mask, FormAlignmentProperty, applyChanged, sheet, QLatin1StringView(formAlignmentPropertyC), m_formAlignment, m_formAlignmentChanged, &rc);
+    variantPropertyToSheet(mask, BoxStretchProperty, applyChanged, sheet, QLatin1StringView(boxStretchPropertyC), m_boxStretch, m_boxStretchChanged, &rc);
+    variantPropertyToSheet(mask, GridRowStretchProperty, applyChanged, sheet, QLatin1StringView(gridRowStretchPropertyC), m_gridRowStretch, m_gridRowStretchChanged, &rc);
+    variantPropertyToSheet(mask, GridColumnStretchProperty, applyChanged, sheet, QLatin1StringView(gridColumnStretchPropertyC), m_gridColumnStretch, m_gridColumnStretchChanged, &rc);
+    variantPropertyToSheet(mask, GridRowMinimumHeightProperty, applyChanged, sheet, QLatin1StringView(gridRowMinimumHeightPropertyC), m_gridRowMinimumHeight, m_gridRowMinimumHeightChanged, &rc);
+    variantPropertyToSheet(mask, GridColumnMinimumWidthProperty, applyChanged, sheet, QLatin1StringView(gridColumnMinimumWidthPropertyC), m_gridColumnMinimumWidth, m_gridColumnMinimumWidthChanged, &rc);
     return rc;
 }
 
diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
index 78d74d3d6..17ccc6cf3 100644
--- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -86,15 +86,15 @@ static bool loadResourceFileData(const QDomElement &fileElem, QtResourceFileData
     if (!fileData)
         return false;
 
-    if (fileElem.tagName() != QLatin1String(rccFileTag)) {
-        *errorMessage = msgTagMismatch(fileElem.tagName(), QLatin1String(rccFileTag));
+    if (fileElem.tagName() != QLatin1StringView(rccFileTag)) {
+        *errorMessage = msgTagMismatch(fileElem.tagName(), QLatin1StringView(rccFileTag));
         return false;
     }
 
     QtResourceFileData &data = *fileData;
 
     data.path = fileElem.text();
-    data.alias = fileElem.attribute(QLatin1String(rccAliasAttribute));
+    data.alias = fileElem.attribute(QLatin1StringView(rccAliasAttribute));
 
     return true;
 }
@@ -104,15 +104,15 @@ static bool loadResourcePrefixData(const QDomElement &prefixElem, QtResourcePref
     if (!prefixData)
         return false;
 
-    if (prefixElem.tagName() != QLatin1String(rccTag)) {
-        *errorMessage = msgTagMismatch(prefixElem.tagName(), QLatin1String(rccTag));
+    if (prefixElem.tagName() != QLatin1StringView(rccTag)) {
+        *errorMessage = msgTagMismatch(prefixElem.tagName(), QLatin1StringView(rccTag));
         return false;
     }
 
     QtResourcePrefixData &data = *prefixData;
 
-    data.prefix = prefixElem.attribute(QLatin1String(rccPrefixAttribute));
-    data.language = prefixElem.attribute(QLatin1String(rccLangAttribute));
+    data.prefix = prefixElem.attribute(QLatin1StringView(rccPrefixAttribute));
+    data.language = prefixElem.attribute(QLatin1StringView(rccLangAttribute));
     QDomElement fileElem = prefixElem.firstChildElement();
     while (!fileElem.isNull()) {
         QtResourceFileData fileData;
@@ -132,8 +132,8 @@ static bool loadQrcFileData(const QDomDocument &doc, const QString &path, QtQrcF
     QtQrcFileData &data = *qrcFileData;
 
     QDomElement docElem = doc.documentElement();
-    if (docElem.tagName() != QLatin1String(rccRootTag)) {
-        *errorMessage = msgTagMismatch(docElem.tagName(), QLatin1String(rccRootTag));
+    if (docElem.tagName() != QLatin1StringView(rccRootTag)) {
+        *errorMessage = msgTagMismatch(docElem.tagName(), QLatin1StringView(rccRootTag));
         return false;
     }
 
@@ -153,9 +153,9 @@ static bool loadQrcFileData(const QDomDocument &doc, const QString &path, QtQrcF
 
 static QDomElement saveResourceFileData(QDomDocument &doc, const QtResourceFileData &fileData)
 {
-    QDomElement fileElem = doc.createElement(QLatin1String(rccFileTag));
+    QDomElement fileElem = doc.createElement(QLatin1StringView(rccFileTag));
     if (!fileData.alias.isEmpty())
-        fileElem.setAttribute(QLatin1String(rccAliasAttribute), fileData.alias);
+        fileElem.setAttribute(QLatin1StringView(rccAliasAttribute), fileData.alias);
 
     QDomText textElem = doc.createTextNode(fileData.path);
     fileElem.appendChild(textElem);
@@ -165,11 +165,11 @@ static QDomElement saveResourceFileData(QDomDocument &doc, const QtResourceFileD
 
 static QDomElement saveResourcePrefixData(QDomDocument &doc, const QtResourcePrefixData &prefixData)
 {
-    QDomElement prefixElem = doc.createElement(QLatin1String(rccTag));
+    QDomElement prefixElem = doc.createElement(QLatin1StringView(rccTag));
     if (!prefixData.prefix.isEmpty())
-        prefixElem.setAttribute(QLatin1String(rccPrefixAttribute), prefixData.prefix);
+        prefixElem.setAttribute(QLatin1StringView(rccPrefixAttribute), prefixData.prefix);
     if (!prefixData.language.isEmpty())
-        prefixElem.setAttribute(QLatin1String(rccLangAttribute), prefixData.language);
+        prefixElem.setAttribute(QLatin1StringView(rccLangAttribute), prefixData.language);
 
     for (const QtResourceFileData &rfd : prefixData.resourceFileList) {
         QDomElement fileElem = saveResourceFileData(doc, rfd);
@@ -182,7 +182,7 @@ static QDomElement saveResourcePrefixData(QDomDocument &doc, const QtResourcePre
 static QDomDocument saveQrcFileData(const QtQrcFileData &qrcFileData)
 {
     QDomDocument doc;
-    QDomElement docElem = doc.createElement(QLatin1String(rccRootTag));
+    QDomElement docElem = doc.createElement(QLatin1StringView(rccRootTag));
     for (const QtResourcePrefixData &prefixData : qrcFileData.resourceList) {
         QDomElement prefixElem = saveResourcePrefixData(doc, prefixData);
 
@@ -1992,9 +1992,9 @@ QtResourceEditorDialog::QtResourceEditorDialog(QDesignerFormEditorInterface *cor
     d_ptr->m_moveDownQrcFileAction->setEnabled(false);
 
     QDesignerSettingsInterface *settings = core->settingsManager();
-    settings->beginGroup(QLatin1String(QrcDialogC));
+    settings->beginGroup(QLatin1StringView(QrcDialogC));
 
-    d_ptr->m_ui.splitter->restoreState(settings->value(QLatin1String(SplitterPosition)).toByteArray());
+    d_ptr->m_ui.splitter->restoreState(settings->value(QLatin1StringView(SplitterPosition)).toByteArray());
     const QVariant geometry = settings->value(QLatin1StringView(ResourceEditorGeometry));
     if (geometry.metaType().id() == QMetaType::QByteArray) // Used to be a QRect up until 5.4.0, QTBUG-43374
         restoreGeometry(geometry.toByteArray());
@@ -2005,9 +2005,9 @@ QtResourceEditorDialog::QtResourceEditorDialog(QDesignerFormEditorInterface *cor
 QtResourceEditorDialog::~QtResourceEditorDialog()
 {
     QDesignerSettingsInterface *settings = d_ptr->m_core->settingsManager();
-    settings->beginGroup(QLatin1String(QrcDialogC));
+    settings->beginGroup(QLatin1StringView(QrcDialogC));
 
-    settings->setValue(QLatin1String(SplitterPosition), d_ptr->m_ui.splitter->saveState());
+    settings->setValue(QLatin1StringView(SplitterPosition), d_ptr->m_ui.splitter->saveState());
     settings->setValue(QLatin1StringView(ResourceEditorGeometry), saveGeometry());
     settings->endGroup();
 
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index ab586c2a5..7e8efd90f 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -174,7 +174,7 @@ void QtResourceViewPrivate::restoreSettings()
     QDesignerSettingsInterface *settings = m_core->settingsManager();
     settings->beginGroup(m_settingsKey);
 
-    m_splitter->restoreState(settings->value(QLatin1String(qrvSplitterPosition)).toByteArray());
+    m_splitter->restoreState(settings->value(QLatin1StringView(qrvSplitterPosition)).toByteArray());
     settings->endGroup();
 }
 
@@ -186,7 +186,7 @@ void QtResourceViewPrivate::saveSettings()
     QDesignerSettingsInterface *settings = m_core->settingsManager();
     settings->beginGroup(m_settingsKey);
 
-    settings->setValue(QLatin1String(qrvSplitterPosition), m_splitter->saveState());
+    settings->setValue(QLatin1StringView(qrvSplitterPosition), m_splitter->saveState());
     settings->endGroup();
 }
 
@@ -718,19 +718,19 @@ bool QtResourceView::dragEnabled() const
 QString QtResourceView::encodeMimeData(ResourceType resourceType, const QString &path)
 {
     QDomDocument doc;
-    QDomElement elem = doc.createElement(QLatin1String(elementResourceData));
+    QDomElement elem = doc.createElement(QLatin1StringView(elementResourceData));
     switch (resourceType) {
     case ResourceImage:
-        elem.setAttribute(QLatin1String(typeAttribute), QLatin1String(typeImage));
+        elem.setAttribute(QLatin1StringView(typeAttribute), QLatin1StringView(typeImage));
         break;
     case ResourceStyleSheet:
-        elem.setAttribute(QLatin1String(typeAttribute), QLatin1String(typeStyleSheet));
+        elem.setAttribute(QLatin1StringView(typeAttribute), QLatin1StringView(typeStyleSheet));
         break;
     case ResourceOther:
-        elem.setAttribute(QLatin1String(typeAttribute), QLatin1String(typeOther));
+        elem.setAttribute(QLatin1StringView(typeAttribute), QLatin1StringView(typeOther));
         break;
     }
-    elem.setAttribute(QLatin1String(fileAttribute), path);
+    elem.setAttribute(QLatin1StringView(fileAttribute), path);
     doc.appendChild(elem);
     return doc.toString();
 }
@@ -758,18 +758,18 @@ bool QtResourceView::decodeMimeData(const QString &text, ResourceType *t, QStrin
         return false;
 
     if (t) {
-        const QString typeAttr = QLatin1String(typeAttribute);
+        const QString typeAttr = QLatin1StringView(typeAttribute);
         if (domElement.hasAttribute (typeAttr)) {
-            const QString typeValue = domElement.attribute(typeAttr, QLatin1String(typeOther));
-            if (typeValue == QLatin1String(typeImage)) {
+            const QString typeValue = domElement.attribute(typeAttr, QLatin1StringView(typeOther));
+            if (typeValue == QLatin1StringView(typeImage)) {
                 *t = ResourceImage;
             } else {
-                *t = typeValue == QLatin1String(typeStyleSheet) ? ResourceStyleSheet : ResourceOther;
+                *t = typeValue == QLatin1StringView(typeStyleSheet) ? ResourceStyleSheet : ResourceOther;
             }
         }
     }
     if (file) {
-        const QString fileAttr = QLatin1String(fileAttribute);
+        const QString fileAttr = QLatin1StringView(fileAttribute);
         if (domElement.hasAttribute(fileAttr)) {
             *file = domElement.attribute(fileAttr, QString());
         } else {
@@ -802,7 +802,7 @@ QtResourceViewDialogPrivate::QtResourceViewDialogPrivate(QDesignerFormEditorInte
     m_view(new QtResourceView(core)),
     m_box(new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel))
 {
-    m_view->setSettingsKey(QLatin1String(ResourceViewDialogC));
+    m_view->setSettingsKey(QLatin1StringView(ResourceViewDialogC));
 }
 
 // ------------ QtResourceViewDialog
@@ -824,9 +824,9 @@ QtResourceViewDialog::QtResourceViewDialog(QDesignerFormEditorInterface *core, Q
     d_ptr->m_view->setResourceModel(core->resourceModel());
 
     QDesignerSettingsInterface *settings = core->settingsManager();
-    settings->beginGroup(QLatin1String(ResourceViewDialogC));
+    settings->beginGroup(QLatin1StringView(ResourceViewDialogC));
 
-    const QVariant geometry = settings->value(QLatin1String(qrvGeometry));
+    const QVariant geometry = settings->value(QLatin1StringView(qrvGeometry));
     if (geometry.metaType().id() == QMetaType::QByteArray) // Used to be a QRect up until 5.4.0, QTBUG-43374.
         restoreGeometry(geometry.toByteArray());
 
@@ -836,9 +836,9 @@ QtResourceViewDialog::QtResourceViewDialog(QDesignerFormEditorInterface *core, Q
 QtResourceViewDialog::~QtResourceViewDialog()
 {
     QDesignerSettingsInterface *settings = d_ptr->m_core->settingsManager();
-    settings->beginGroup(QLatin1String(ResourceViewDialogC));
+    settings->beginGroup(QLatin1StringView(ResourceViewDialogC));
 
-    settings->setValue(QLatin1String(qrvGeometry), saveGeometry());
+    settings->setValue(QLatin1StringView(qrvGeometry), saveGeometry());
 
     settings->endGroup();
 }
diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp
index ba08328cb..d4d361442 100644
--- a/src/designer/src/lib/shared/richtexteditor.cpp
+++ b/src/designer/src/lib/shared/richtexteditor.cpp
@@ -260,9 +260,9 @@ void HtmlTextEdit::contextMenuEvent(QContextMenuEvent *event)
     };
 
     for (const Entry &e : entries) {
-        QAction *entityAction = new QAction(QLatin1String(e.text),
+        QAction *entityAction = new QAction(QLatin1StringView(e.text),
                                             htmlMenu);
-        entityAction->setData(QLatin1String(e.entity));
+        entityAction->setData(QLatin1StringView(e.entity));
         htmlMenu->addAction(entityAction);
     }
 
@@ -730,8 +730,8 @@ RichTextEditorDialog::RichTextEditorDialog(QDesignerFormEditorInterface *core, Q
     // Read settings
     const QDesignerSettingsInterface *settings = core->settingsManager();
     const QString rootKey = QLatin1StringView(RichTextDialogGroupC) + u'/';
-    const QByteArray lastGeometry = settings->value(rootKey + QLatin1String(GeometryKeyC)).toByteArray();
-    const int initialTab = settings->value(rootKey + QLatin1String(TabKeyC), QVariant(m_initialTab)).toInt();
+    const QByteArray lastGeometry = settings->value(rootKey + QLatin1StringView(GeometryKeyC)).toByteArray();
+    const int initialTab = settings->value(rootKey + QLatin1StringView(TabKeyC), QVariant(m_initialTab)).toInt();
     if (initialTab == RichTextIndex || initialTab == SourceIndex)
         m_initialTab = initialTab;
 
@@ -781,10 +781,10 @@ RichTextEditorDialog::RichTextEditorDialog(QDesignerFormEditorInterface *core, Q
 RichTextEditorDialog::~RichTextEditorDialog()
 {
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    settings->beginGroup(QLatin1String(RichTextDialogGroupC));
+    settings->beginGroup(QLatin1StringView(RichTextDialogGroupC));
 
-    settings->setValue(QLatin1String(GeometryKeyC), saveGeometry());
-    settings->setValue(QLatin1String(TabKeyC), m_tab_widget->currentIndex());
+    settings->setValue(QLatin1StringView(GeometryKeyC), saveGeometry());
+    settings->setValue(QLatin1StringView(TabKeyC), m_tab_widget->currentIndex());
     settings->endGroup();
 }
 
diff --git a/src/designer/src/lib/shared/shared_settings.cpp b/src/designer/src/lib/shared/shared_settings.cpp
index 73ad10689..77d1d3570 100644
--- a/src/designer/src/lib/shared/shared_settings.cpp
+++ b/src/designer/src/lib/shared/shared_settings.cpp
@@ -63,7 +63,7 @@ Grid QDesignerSharedSettings::defaultGrid() const
 {
     Grid grid;
     const QVariantMap defaultGridMap
-            = m_settings->value(QLatin1String(defaultGridKey), QVariantMap()).toMap();
+            = m_settings->value(QLatin1StringView(defaultGridKey), QVariantMap()).toMap();
     if (!defaultGridMap.isEmpty())
         grid.fromVariantMap(defaultGridMap);
     return grid;
@@ -71,7 +71,7 @@ Grid QDesignerSharedSettings::defaultGrid() const
 
 void QDesignerSharedSettings::setDefaultGrid(const Grid &grid)
 {
-    m_settings->setValue(QLatin1String(defaultGridKey), grid.toVariantMap());
+    m_settings->setValue(QLatin1StringView(defaultGridKey), grid.toVariantMap());
 }
 
 const QStringList &QDesignerSharedSettings::defaultFormTemplatePaths()
@@ -116,23 +116,23 @@ void QDesignerSharedSettings::migrateTemplates()
 
 QStringList QDesignerSharedSettings::formTemplatePaths() const
 {
-    return m_settings->value(QLatin1String(formTemplatePathsKey),
+    return m_settings->value(QLatin1StringView(formTemplatePathsKey),
                             defaultFormTemplatePaths()).toStringList();
 }
 
 void QDesignerSharedSettings::setFormTemplatePaths(const QStringList &paths)
 {
-    m_settings->setValue(QLatin1String(formTemplatePathsKey), paths);
+    m_settings->setValue(QLatin1StringView(formTemplatePathsKey), paths);
 }
 
 QString  QDesignerSharedSettings::formTemplate() const
 {
-    return m_settings->value(QLatin1String(formTemplateKey)).toString();
+    return m_settings->value(QLatin1StringView(formTemplateKey)).toString();
 }
 
 void QDesignerSharedSettings::setFormTemplate(const QString &t)
 {
-    m_settings->setValue(QLatin1String(formTemplateKey), t);
+    m_settings->setValue(QLatin1StringView(formTemplateKey), t);
 }
 
 void QDesignerSharedSettings::setAdditionalFormTemplatePaths(const QStringList &additionalPaths)
@@ -157,15 +157,15 @@ QStringList QDesignerSharedSettings::additionalFormTemplatePaths() const
 
 QSize QDesignerSharedSettings::newFormSize() const
 {
-    return m_settings->value(QLatin1String(newFormSizeKey), QSize(0, 0)).toSize();
+    return m_settings->value(QLatin1StringView(newFormSizeKey), QSize(0, 0)).toSize();
 }
 
 void  QDesignerSharedSettings::setNewFormSize(const QSize &s)
 {
     if (s.isNull()) {
-        m_settings->remove(QLatin1String(newFormSizeKey));
+        m_settings->remove(QLatin1StringView(newFormSizeKey));
     } else {
-        m_settings->setValue(QLatin1String(newFormSizeKey), s);
+        m_settings->setValue(QLatin1StringView(newFormSizeKey), s);
     }
 }
 
@@ -173,54 +173,54 @@ void  QDesignerSharedSettings::setNewFormSize(const QSize &s)
 PreviewConfiguration QDesignerSharedSettings::customPreviewConfiguration() const
 {
     PreviewConfiguration configuration;
-    configuration.fromSettings(QLatin1String(previewKey), m_settings);
+    configuration.fromSettings(QLatin1StringView(previewKey), m_settings);
     return configuration;
 }
 
 void QDesignerSharedSettings::setCustomPreviewConfiguration(const PreviewConfiguration &configuration)
 {
-    configuration.toSettings(QLatin1String(previewKey), m_settings);
+    configuration.toSettings(QLatin1StringView(previewKey), m_settings);
 }
 
 bool QDesignerSharedSettings::isCustomPreviewConfigurationEnabled() const
 {
-    m_settings->beginGroup(QLatin1String(previewKey));
-    bool isEnabled = m_settings->value(QLatin1String(enabledKey), false).toBool();
+    m_settings->beginGroup(QLatin1StringView(previewKey));
+    bool isEnabled = m_settings->value(QLatin1StringView(enabledKey), false).toBool();
     m_settings->endGroup();
     return isEnabled;
 }
 
 void QDesignerSharedSettings::setCustomPreviewConfigurationEnabled(bool enabled)
 {
-    m_settings->beginGroup(QLatin1String(previewKey));
-    m_settings->setValue(QLatin1String(enabledKey), enabled);
+    m_settings->beginGroup(QLatin1StringView(previewKey));
+    m_settings->setValue(QLatin1StringView(enabledKey), enabled);
     m_settings->endGroup();
 }
 
 QStringList QDesignerSharedSettings::userDeviceSkins() const
 {
-    m_settings->beginGroup(QLatin1String(previewKey));
+    m_settings->beginGroup(QLatin1StringView(previewKey));
     QStringList userDeviceSkins
-            = m_settings->value(QLatin1String(userDeviceSkinsKey), QStringList()).toStringList();
+            = m_settings->value(QLatin1StringView(userDeviceSkinsKey), QStringList()).toStringList();
     m_settings->endGroup();
     return userDeviceSkins;
 }
 
 void QDesignerSharedSettings::setUserDeviceSkins(const QStringList &userDeviceSkins)
 {
-    m_settings->beginGroup(QLatin1String(previewKey));
-    m_settings->setValue(QLatin1String(userDeviceSkinsKey), userDeviceSkins);
+    m_settings->beginGroup(QLatin1StringView(previewKey));
+    m_settings->setValue(QLatin1StringView(userDeviceSkinsKey), userDeviceSkins);
     m_settings->endGroup();
 }
 
 int QDesignerSharedSettings::zoom() const
 {
-    return m_settings->value(QLatin1String(zoomKey), 100).toInt();
+    return m_settings->value(QLatin1StringView(zoomKey), 100).toInt();
 }
 
 void QDesignerSharedSettings::setZoom(int z)
 {
-    m_settings->setValue(QLatin1String(zoomKey), QVariant(z));
+    m_settings->setValue(QLatin1StringView(zoomKey), QVariant(z));
 }
 
 ObjectNamingMode QDesignerSharedSettings::objectNamingMode() const
@@ -239,12 +239,12 @@ void QDesignerSharedSettings::setObjectNamingMode(ObjectNamingMode n)
 
 bool QDesignerSharedSettings::zoomEnabled() const
 {
-    return m_settings->value(QLatin1String(zoomEnabledKey), false).toBool();
+    return m_settings->value(QLatin1StringView(zoomEnabledKey), false).toBool();
 }
 
 void QDesignerSharedSettings::setZoomEnabled(bool v)
 {
-     m_settings->setValue(QLatin1String(zoomEnabledKey), v);
+     m_settings->setValue(QLatin1StringView(zoomEnabledKey), v);
 }
 
 DeviceProfile QDesignerSharedSettings::currentDeviceProfile() const
@@ -254,12 +254,12 @@ DeviceProfile QDesignerSharedSettings::currentDeviceProfile() const
 
 void QDesignerSharedSettings::setCurrentDeviceProfileIndex(int i)
 {
-    m_settings->setValue(QLatin1String(deviceProfileIndexKey), i);
+    m_settings->setValue(QLatin1StringView(deviceProfileIndexKey), i);
 }
 
 int QDesignerSharedSettings::currentDeviceProfileIndex() const
 {
-     return m_settings->value(QLatin1String(deviceProfileIndexKey), -1).toInt();
+     return m_settings->value(QLatin1StringView(deviceProfileIndexKey), -1).toInt();
 }
 
 static inline QString msgWarnDeviceProfileXml(const QString &msg)
@@ -285,7 +285,7 @@ DeviceProfile QDesignerSharedSettings::deviceProfileAt(int idx) const
 
 QStringList QDesignerSharedSettings::deviceProfileXml() const
 {
-    return m_settings->value(QLatin1String(deviceProfilesKey), QStringList()).toStringList();
+    return m_settings->value(QLatin1StringView(deviceProfilesKey), QStringList()).toStringList();
 }
 
 QDesignerSharedSettings::DeviceProfileList QDesignerSharedSettings::deviceProfiles() const
@@ -312,7 +312,7 @@ void QDesignerSharedSettings::setDeviceProfiles(const DeviceProfileList &dpl)
     QStringList l;
     for (const auto &dp : dpl)
         l.push_back(dp.toXml());
-    m_settings->setValue(QLatin1String(deviceProfilesKey), l);
+    m_settings->setValue(QLatin1StringView(deviceProfilesKey), l);
 }
 }
 
diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp
index 4d2de5136..af1b01661 100644
--- a/src/designer/src/lib/shared/signalslotdialog.cpp
+++ b/src/designer/src/lib/shared/signalslotdialog.cpp
@@ -66,8 +66,8 @@ namespace {
 
     SignatureDelegate::SignatureDelegate(QObject * parent) :
         QItemDelegate(parent),
-        m_signatureRegexp(QLatin1String(signatureRegExp)),
-        m_methodNameRegexp(QLatin1String(methodNameRegExp))
+        m_signatureRegexp(QLatin1StringView(signatureRegExp)),
+        m_methodNameRegexp(QLatin1StringView(methodNameRegExp))
     {
         Q_ASSERT(m_signatureRegexp.isValid());
         Q_ASSERT(m_methodNameRegexp.isValid());
diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp
index a77a51bd7..c286eba3e 100644
--- a/src/designer/src/lib/shared/stylesheeteditor.cpp
+++ b/src/designer/src/lib/shared/stylesheeteditor.cpp
@@ -142,13 +142,13 @@ StyleSheetEditorDialog::StyleSheetEditorDialog(QDesignerFormEditorInterface *cor
     QMenu *colorActionMenu = new QMenu(this);
 
     for (int resourceProperty = 0; resourceProperties[resourceProperty]; ++resourceProperty) {
-        const QString resourcePropertyName = QLatin1String(resourceProperties[resourceProperty]);
+        const QString resourcePropertyName = QLatin1StringView(resourceProperties[resourceProperty]);
         resourceActionMenu->addAction(resourcePropertyName,
                                       this, [this, resourcePropertyName] { this->slotAddResource(resourcePropertyName); });
     }
 
     for (int colorProperty = 0; colorProperties[colorProperty]; ++colorProperty) {
-        const QString colorPropertyName = QLatin1String(colorProperties[colorProperty]);
+        const QString colorPropertyName = QLatin1StringView(colorProperties[colorProperty]);
         colorActionMenu->addAction(colorPropertyName,
                                    this, [this, colorPropertyName] { this->slotAddColor(colorPropertyName); });
         gradientActionMenu->addAction(colorPropertyName,
@@ -170,10 +170,10 @@ StyleSheetEditorDialog::StyleSheetEditorDialog(QDesignerFormEditorInterface *cor
     m_editor->setFocus();
 
     QDesignerSettingsInterface *settings = core->settingsManager();
-    settings->beginGroup(QLatin1String(StyleSheetDialogC));
+    settings->beginGroup(QLatin1StringView(StyleSheetDialogC));
 
-    if (settings->contains(QLatin1String(seGeometry)))
-        restoreGeometry(settings->value(QLatin1String(seGeometry)).toByteArray());
+    if (settings->contains(QLatin1StringView(seGeometry)))
+        restoreGeometry(settings->value(QLatin1StringView(seGeometry)).toByteArray());
 
     settings->endGroup();
 }
@@ -181,9 +181,9 @@ StyleSheetEditorDialog::StyleSheetEditorDialog(QDesignerFormEditorInterface *cor
 StyleSheetEditorDialog::~StyleSheetEditorDialog()
 {
     QDesignerSettingsInterface *settings = m_core->settingsManager();
-    settings->beginGroup(QLatin1String(StyleSheetDialogC));
+    settings->beginGroup(QLatin1StringView(StyleSheetDialogC));
 
-    settings->setValue(QLatin1String(seGeometry), saveGeometry());
+    settings->setValue(QLatin1StringView(seGeometry), saveGeometry());
     settings->endGroup();
 }
 
@@ -390,7 +390,7 @@ StyleSheetPropertyEditorDialog::StyleSheetPropertyEditorDialog(QWidget *parent,
     QDesignerPropertySheetExtension *sheet =
             qt_extension<QDesignerPropertySheetExtension*>(m_fw->core()->extensionManager(), m_widget);
     Q_ASSERT(sheet != nullptr);
-    const int index = sheet->indexOf(QLatin1String(styleSheetProperty));
+    const int index = sheet->indexOf(QLatin1StringView(styleSheetProperty));
     const PropertySheetStringValue value = qvariant_cast<PropertySheetStringValue>(sheet->property(index));
     setText(value.value());
 }
@@ -398,7 +398,7 @@ StyleSheetPropertyEditorDialog::StyleSheetPropertyEditorDialog(QWidget *parent,
 void StyleSheetPropertyEditorDialog::applyStyleSheet()
 {
     const PropertySheetStringValue value(text(), false);
-    m_fw->cursor()->setWidgetProperty(m_widget, QLatin1String(styleSheetProperty), QVariant::fromValue(value));
+    m_fw->cursor()->setWidgetProperty(m_widget, QLatin1StringView(styleSheetProperty), QVariant::fromValue(value));
 }
 
 } // namespace qdesigner_internal
diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp
index 086cffa16..9fab0b317 100644
--- a/src/designer/src/lib/shared/widgetfactory.cpp
+++ b/src/designer/src/lib/shared/widgetfactory.cpp
@@ -477,7 +477,7 @@ QString WidgetFactory::classNameOf(QDesignerFormEditorInterface *c, const QObjec
 
     const char *className = o->metaObject()->className();
     if (!o->isWidgetType())
-        return QLatin1String(className);
+        return QLatin1StringView(className);
     const QWidget *w = static_cast<const QWidget*>(o);
     // check promoted before designer special
     const QString customClassName = promotedCustomClassName(c, const_cast<QWidget*>(w));
@@ -497,7 +497,7 @@ QString WidgetFactory::classNameOf(QDesignerFormEditorInterface *c, const QObjec
     if (isAxWidget(w))
         return u"QAxWidget"_s;
 #endif
-    return QLatin1String(className);
+    return QLatin1StringView(className);
 }
 
 QLayout *WidgetFactory::createUnmanagedLayout(QWidget *parentWidget, int type)
@@ -740,7 +740,7 @@ void WidgetFactory::initialize(QObject *object) const
 
 static inline QString classNameOfStyle(const QStyle *s)
 {
-    return QLatin1String(s->metaObject()->className());
+    return QLatin1StringView(s->metaObject()->className());
 }
 
 QString WidgetFactory::styleName() const
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index d95d18785..38246a78e 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -241,7 +241,7 @@ ZoomedEventFilterRedirector::ZoomedEventFilterRedirector(ZoomWidget *zw, QObject
     QObject(parent),
     m_zw(zw)
 {
-    setObjectName(QLatin1String(zoomedEventFilterRedirectorNameC));
+    setObjectName(QLatin1StringView(zoomedEventFilterRedirectorNameC));
 }
 
 bool ZoomedEventFilterRedirector::eventFilter(QObject *watched, QEvent *event)
@@ -268,7 +268,7 @@ void ZoomWidget::setWidget(QWidget *w, Qt::WindowFlags wFlags)
         scene().removeItem(m_proxy);
         if (QWidget *w = m_proxy->widget()) {
             // remove the event filter
-            if (QObject *evf =  w->findChild<QObject*>(QLatin1String(zoomedEventFilterRedirectorNameC)))
+            if (QObject *evf =  w->findChild<QObject*>(QLatin1StringView(zoomedEventFilterRedirectorNameC)))
                 w->removeEventFilter(evf);
         }
         m_proxy->deleteLater();
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 49c5a116a..be2313bc6 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -360,7 +360,7 @@ bool QAbstractFormBuilder::addItem(DomWidget *ui_widget, QWidget *widget, QWidge
     if (parentWidget == nullptr)
         return true;
     // Check special cases. First: Custom container
-    const QString className = QLatin1String(parentWidget->metaObject()->className());
+    const QString className = QLatin1StringView(parentWidget->metaObject()->className());
     const QString addPageMethod = d->customWidgetAddPageMethod(className);
     if (!addPageMethod.isEmpty()) {
         // If this fails ( non-existent or non-slot), use ContainerExtension in Designer, else it can't be helped
@@ -1057,7 +1057,7 @@ DomConnections *QAbstractFormBuilder::saveConnections()
 DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive)
 {
     DomWidget *ui_widget = new DomWidget();
-    ui_widget->setAttributeClass(QLatin1String(widget->metaObject()->className()));
+    ui_widget->setAttributeClass(QLatin1StringView(widget->metaObject()->className()));
     ui_widget->setAttributeName(widget->objectName());
 
     ui_widget->setElementProperty(computeProperties(widget));
@@ -1283,7 +1283,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout
 {
     Q_UNUSED(ui_layout);
     DomLayout *lay = new DomLayout();
-    lay->setAttributeClass(QLatin1String(layout->metaObject()->className()));
+    lay->setAttributeClass(QLatin1StringView(layout->metaObject()->className()));
     const QString objectName = layout->objectName();
     if (!objectName.isEmpty())
         lay->setAttributeName(objectName);
@@ -1405,7 +1405,7 @@ QList<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj)
         const QString pname = QString::fromUtf8(propertyNames.at(i));
         const QMetaProperty prop = meta->property(meta->indexOfProperty(pname.toUtf8()));
 
-        if (!prop.isWritable() || !checkProperty(obj, QLatin1String(prop.name())))
+        if (!prop.isWritable() || !checkProperty(obj, QLatin1StringView(prop.name())))
             continue;
 
         const QVariant v = prop.read(obj);
@@ -1871,7 +1871,7 @@ void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, Do
         domString->setText(buttonGroup->objectName());
         domString->setAttributeNotr(u"true"_s);
         DomProperty *domProperty = new DomProperty();
-        domProperty->setAttributeName(QLatin1String(buttonGroupPropertyC));
+        domProperty->setAttributeName(QLatin1StringView(buttonGroupPropertyC));
         domProperty->setElementString(domString);
         attributes += domProperty;
         ui_widget->setElementAttribute(attributes);
@@ -2217,7 +2217,7 @@ static QString buttonGroupName(const DomWidget *ui_widget)
     const auto &attributes = ui_widget->elementAttribute();
     if (attributes.isEmpty())
         return QString();
-    const QString buttonGroupProperty = QLatin1String(buttonGroupPropertyC);
+    const QString buttonGroupProperty = QLatin1StringView(buttonGroupPropertyC);
     for (const DomProperty *p : attributes) {
         if (p->attributeName() == buttonGroupProperty)
             return p->elementString()->text();
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index 9a54212da..2d5286205 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -112,7 +112,7 @@ QWidget *QFormBuilder::create(DomWidget *ui_widget, QWidget *parentWidget)
             && !qobject_cast<QDockWidget *>(parentWidget)
 #endif
         ) {
-        const QString parentClassName = QLatin1String(parentWidget->metaObject()->className());
+        const QString parentClassName = QLatin1StringView(parentWidget->metaObject()->className());
         if (!d->isCustomWidgetContainer(parentClassName))
             d->setProcessingLayoutWidget(true);
     }
@@ -216,7 +216,7 @@ QLayout *QFormBuilder::createLayout(const QString &layoutName, QObject *parent,
 #define DECLARE_COMPAT_WIDGET(W, C)
 
 #define DECLARE_LAYOUT(L, C) \
-    if (layoutName == QLatin1String(#L)) { \
+    if (layoutName == QLatin1StringView(#L)) { \
         Q_ASSERT(l == 0); \
         l = parentLayout \
             ? new L() \
diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp
index c8ab290bc..775dcd0a0 100644
--- a/src/designer/src/lib/uilib/formbuilderextra.cpp
+++ b/src/designer/src/lib/uilib/formbuilderextra.cpp
@@ -514,7 +514,7 @@ DomColorGroup *QFormBuilderExtra::saveColorGroup(const QPalette &palette,
             const QBrush &br = palette.brush(colorGroup, role);
             DomColorRole *colorRole = new DomColorRole();
             colorRole->setElementBrush(saveBrush(br));
-            colorRole->setAttributeRole(QLatin1String(colorRole_enum.valueToKey(role)));
+            colorRole->setAttributeRole(QLatin1StringView(colorRole_enum.valueToKey(role)));
             colorRoles.append(colorRole);
         }
     }
@@ -620,7 +620,7 @@ DomBrush *QFormBuilderExtra::saveBrush(const QBrush &br)
 
     DomBrush *brush = new DomBrush();
     const Qt::BrushStyle style = br.style();
-    brush->setAttributeBrushStyle(QLatin1String(brushStyle_enum.valueToKey(style)));
+    brush->setAttributeBrushStyle(QLatin1StringView(brushStyle_enum.valueToKey(style)));
     if (style == Qt::LinearGradientPattern ||
                 style == Qt::RadialGradientPattern ||
                 style == Qt::ConicalGradientPattern) {
@@ -631,9 +631,9 @@ DomBrush *QFormBuilderExtra::saveBrush(const QBrush &br)
         DomGradient *gradient = new DomGradient();
         const QGradient *gr = br.gradient();
         const QGradient::Type type = gr->type();
-        gradient->setAttributeType(QLatin1String(gradientType_enum.valueToKey(type)));
-        gradient->setAttributeSpread(QLatin1String(gradientSpread_enum.valueToKey(gr->spread())));
-        gradient->setAttributeCoordinateMode(QLatin1String(gradientCoordinate_enum.valueToKey(gr->coordinateMode())));
+        gradient->setAttributeType(QLatin1StringView(gradientType_enum.valueToKey(type)));
+        gradient->setAttributeSpread(QLatin1StringView(gradientSpread_enum.valueToKey(gr->spread())));
+        gradient->setAttributeCoordinateMode(QLatin1StringView(gradientCoordinate_enum.valueToKey(gr->coordinateMode())));
         QList<DomGradientStop *> stops;
         const QGradientStops st = gr->stops();
         for (const QGradientStop &pair : st) {
diff --git a/src/designer/src/lib/uilib/properties.cpp b/src/designer/src/lib/uilib/properties.cpp
index 0995ee465..d391494b5 100644
--- a/src/designer/src/lib/uilib/properties.cpp
+++ b/src/designer/src/lib/uilib/properties.cpp
@@ -464,11 +464,11 @@ static bool applySimpleProperty(const QVariant &v, bool translateString, DomProp
             fnt->setElementKerning(font.kerning());
         if (mask & QFont::StyleStrategyResolved) {
             const QMetaEnum styleStrategy_enum = metaEnum<QAbstractFormBuilderGadget>("styleStrategy");
-            fnt->setElementStyleStrategy(QLatin1String(styleStrategy_enum.valueToKey(font.styleStrategy())));
+            fnt->setElementStyleStrategy(QLatin1StringView(styleStrategy_enum.valueToKey(font.styleStrategy())));
         }
         if (mask & QFont::HintingPreferenceResolved) {
             const QMetaEnum hintingPreference_enum = metaEnum<QAbstractFormBuilderGadget>("hintingPreference");
-            fnt->setElementHintingPreference(QLatin1String(hintingPreference_enum.valueToKey(font.hintingPreference())));
+            fnt->setElementHintingPreference(QLatin1StringView(hintingPreference_enum.valueToKey(font.hintingPreference())));
         }
 
         dom_prop->setElementFont(fnt);
@@ -478,7 +478,7 @@ static bool applySimpleProperty(const QVariant &v, bool translateString, DomProp
 #if QT_CONFIG(cursor)
     case QMetaType::QCursor: {
         const QMetaEnum cursorShape_enum = metaEnum<QAbstractFormBuilderGadget>("cursorShape");
-        dom_prop->setElementCursorShape(QLatin1String(cursorShape_enum.valueToKey(qvariant_cast<QCursor>(v).shape())));
+        dom_prop->setElementCursorShape(QLatin1StringView(cursorShape_enum.valueToKey(qvariant_cast<QCursor>(v).shape())));
         }
         return true;
 #endif
@@ -497,8 +497,8 @@ static bool applySimpleProperty(const QVariant &v, bool translateString, DomProp
         const QMetaEnum language_enum = metaEnum<QAbstractFormBuilderGadget>("language");
         const QMetaEnum territory_enum = metaEnum<QAbstractFormBuilderGadget>("country");
 
-        dom->setAttributeLanguage(QLatin1String(language_enum.valueToKey(locale.language())));
-        dom->setAttributeCountry(QLatin1String(territory_enum.valueToKey(locale.territory())));
+        dom->setAttributeLanguage(QLatin1StringView(language_enum.valueToKey(locale.language())));
+        dom->setAttributeCountry(QLatin1StringView(territory_enum.valueToKey(locale.territory())));
 
         dom_prop->setElementLocale(dom);
         }
@@ -513,8 +513,8 @@ static bool applySimpleProperty(const QVariant &v, bool translateString, DomProp
 
         const QMetaEnum sizeType_enum = metaEnum<QAbstractFormBuilderGadget>("sizeType");
 
-        dom->setAttributeHSizeType(QLatin1String(sizeType_enum.valueToKey(sizePolicy.horizontalPolicy())));
-        dom->setAttributeVSizeType(QLatin1String(sizeType_enum.valueToKey(sizePolicy.verticalPolicy())));
+        dom->setAttributeHSizeType(QLatin1StringView(sizeType_enum.valueToKey(sizePolicy.horizontalPolicy())));
+        dom->setAttributeVSizeType(QLatin1StringView(sizeType_enum.valueToKey(sizePolicy.verticalPolicy())));
 
         dom_prop->setElementSizePolicy(dom);
     }
@@ -587,7 +587,7 @@ static bool applySimpleProperty(const QVariant &v, bool translateString, DomProp
 static QString msgCannotWriteProperty(const QString &pname, const QVariant &v)
 {
     return QCoreApplication::translate("QFormBuilder", "The property %1 could not be written. The type %2 is not supported yet.").
-                       arg(pname).arg(QLatin1String(v.typeName()));
+                       arg(pname).arg(QLatin1StringView(v.typeName()));
 
 }
 
diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index 32ab0b07c..2c6df22c1 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -27,6 +27,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace {
     enum { joydistance = 10, key_repeat_period = 50, key_repeat_delay = 500 };
     enum { debugDeviceSkin = 0 };
@@ -90,7 +92,7 @@ bool DeviceSkinParameters::read(const QString &skinDirectory,  ReadMode rm,  QSt
         prefix += QLatin1Char('/');
         fn = prefix;
         fn += fi.baseName();
-        fn += QLatin1String(".skin");
+        fn += ".skin"_L1;
     } else if (fi.isFile()){
         fn = skinFile;
         prefix = fi.path();
@@ -121,20 +123,20 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
     QString mark;
     ts >> mark;
     hasMouseHover = true; // historical default
-    if ( mark == QLatin1String("[SkinFile]") ) {
-        const QString UpKey = QLatin1String("Up");
-        const QString DownKey = QLatin1String("Down");
-        const QString ClosedKey = QLatin1String("Closed");
-        const QString ClosedAreasKey = QLatin1String("ClosedAreas");
-        const QString ScreenKey = QLatin1String("Screen");
-        const QString ScreenDepthKey = QLatin1String("ScreenDepth");
-        const QString BackScreenKey = QLatin1String("BackScreen");
-        const QString ClosedScreenKey = QLatin1String("ClosedScreen");
-        const QString CursorKey = QLatin1String("Cursor");
-        const QString AreasKey = QLatin1String("Areas");
-        const QString ToggleAreasKey = QLatin1String("ToggleAreas");
-        const QString ToggleActiveAreasKey = QLatin1String("ToggleActiveAreas");
-        const QString HasMouseHoverKey = QLatin1String("HasMouseHover");
+    if (mark == "[SkinFile]"_L1) {
+        const QString UpKey = "Up"_L1;
+        const QString DownKey = "Down"_L1;
+        const QString ClosedKey = "Closed"_L1;
+        const QString ClosedAreasKey = "ClosedAreas"_L1;
+        const QString ScreenKey = "Screen"_L1;
+        const QString ScreenDepthKey = "ScreenDepth"_L1;
+        const QString BackScreenKey = "BackScreen"_L1;
+        const QString ClosedScreenKey = "ClosedScreen"_L1;
+        const QString CursorKey = "Cursor"_L1;
+        const QString AreasKey = "Areas"_L1;
+        const QString ToggleAreasKey = "ToggleAreas"_L1;
+        const QString ToggleActiveAreasKey = "ToggleActiveAreas"_L1;
+        const QString HasMouseHoverKey = "HasMouseHover"_L1;
         // New
         while (!nareas) {
             QString line = ts.readLine();
@@ -175,7 +177,7 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
                     } else if ( key == ToggleActiveAreasKey ) {
                         toggleActiveAreas = value.split(QLatin1Char(' '));
                     } else if ( key == HasMouseHoverKey ) {
-                        hasMouseHover = value == QLatin1String("true") || value == QLatin1String("1");
+                        hasMouseHover = value == "true"_L1 || value == "1"_L1;
                     }
                 } else {
                     *errorMessage =  DeviceSkin::tr("Syntax error: %1").arg(line);
@@ -249,8 +251,8 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
     int i = 0;
     ts.readLine(); // eol
     joystick = -1;
-    const QString Joystick = QLatin1String("Joystick");
-    const QRegularExpression splitRe(QLatin1String("[ \t][ \t]*"));
+    const QString Joystick = "Joystick"_L1;
+    const QRegularExpression splitRe("[ \t][ \t]*"_L1);
     Q_ASSERT(splitRe.isValid());
     while (i < nareas && !ts.atEnd() ) {
         buttonAreas.push_back(DeviceSkinButtonArea());
@@ -264,7 +266,7 @@ bool DeviceSkinParameters::read(QTextStream &ts, ReadMode rm, QString *errorMess
             } else {
                 area.name = tok[0];
                 QString k = tok[1];
-                if ( k.left(2).toLower() == QLatin1String("0x")) {
+                if ( k.left(2).toLower() == "0x"_L1) {
                     area.keyCode = k.mid(2).toInt(0,16);
                 } else {
                     area.keyCode = k.toInt();
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index 554160af5..1944beaf1 100644
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -35,6 +35,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QIcon afwCreateIconSet(const QString &name)
 {
     QStringList candidates = QStringList()
@@ -77,7 +79,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
 #endif
 
     m_toolClose = new QToolButton(this);
-    m_toolClose->setIcon(afwCreateIconSet(QLatin1String("closetab.png")));
+    m_toolClose->setIcon(afwCreateIconSet("closetab.png"_L1));
     m_toolClose->setAutoRaise(true);
     layOut->addWidget(m_toolClose);
     connect(m_toolClose, &QAbstractButton::clicked, this, &AbstractFindWidget::deactivate);
@@ -92,7 +94,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
     m_toolPrevious->setAutoRaise(true);
     m_toolPrevious->setText(tr("&Previous"));
     m_toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    m_toolPrevious->setIcon(afwCreateIconSet(QLatin1String("previous.png")));
+    m_toolPrevious->setIcon(afwCreateIconSet("previous.png"_L1));
     layOut->addWidget(m_toolPrevious);
     connect(m_toolPrevious, &QAbstractButton::clicked, this, &AbstractFindWidget::findPrevious);
 
@@ -100,7 +102,7 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
     m_toolNext->setAutoRaise(true);
     m_toolNext->setText(tr("&Next"));
     m_toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    m_toolNext->setIcon(afwCreateIconSet(QLatin1String("next.png")));
+    m_toolNext->setIcon(afwCreateIconSet("next.png"_L1));
     layOut->addWidget(m_toolNext);
     connect(m_toolNext, &QAbstractButton::clicked, this, &AbstractFindWidget::findNext);
 
@@ -169,7 +171,7 @@ AbstractFindWidget::~AbstractFindWidget() = default;
  */
 QIcon AbstractFindWidget::findIconSet()
 {
-    return afwCreateIconSet(QLatin1String("searchfind.png"));
+    return afwCreateIconSet("searchfind.png"_L1);
 }
 
 /*!
diff --git a/src/shared/findwidget/itemviewfindwidget.cpp b/src/shared/findwidget/itemviewfindwidget.cpp
index 01e323596..3981a4952 100644
--- a/src/shared/findwidget/itemviewfindwidget.cpp
+++ b/src/shared/findwidget/itemviewfindwidget.cpp
@@ -35,6 +35,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     Constructs a ItemViewFindWidget.
 
@@ -266,8 +268,8 @@ QModelIndex ItemViewFindWidget::findHelper(const QString &textToFind, bool skipC
             Qt::CaseSensitivity cs = caseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive;
 
             if (wholeWords()) {
-                QString rx = QLatin1String("\\b") + QRegularExpression::escape(textToFind)
-                             + QLatin1String("\\b");
+                QString rx = "\\b"_L1 + QRegularExpression::escape(textToFind)
+                             + "\\b"_L1;
                 QRegularExpression re(rx);
                 if (cs == Qt::CaseInsensitive)
                     re.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp
index b8e5e0bcf..9a0d892d6 100644
--- a/src/shared/fontpanel/fontpanel.cpp
+++ b/src/shared/fontpanel/fontpanel.cpp
@@ -13,6 +13,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 FontPanel::FontPanel(QWidget *parentWidget) :
     QGroupBox(parentWidget),
     m_previewLineEdit(new QLineEdit),
@@ -62,9 +64,9 @@ QFont FontPanel::selectedFont() const
     const QString family = rc.family();
     rc.setPointSize(pointSize());
     const QString styleDescription = styleString();
-    if (styleDescription.contains(QLatin1String("Italic")))
+    if (styleDescription.contains("Italic"_L1))
         rc.setStyle(QFont::StyleItalic);
-    else if (styleDescription.contains(QLatin1String("Oblique")))
+    else if (styleDescription.contains("Oblique"_L1))
         rc.setStyle(QFont::StyleOblique);
     else
         rc.setStyle(QFont::StyleNormal);
@@ -180,7 +182,7 @@ void FontPanel::updateFamily(const QString &family)
     m_styleComboBox->setEnabled(hasStyles);
 
     int normalIndex = -1;
-    const QString normalStyle = QLatin1String("Normal");
+    const QString normalStyle = "Normal"_L1;
 
     if (hasStyles) {
         for (const QString &style : styles) {
diff --git a/src/shared/qtgradienteditor/qtgradienteditor.cpp b/src/shared/qtgradienteditor/qtgradienteditor.cpp
index 6f83aaf15..e6f01b59f 100644
--- a/src/shared/qtgradienteditor/qtgradienteditor.cpp
+++ b/src/shared/qtgradienteditor/qtgradienteditor.cpp
@@ -9,6 +9,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QtGradientEditorPrivate : public QObject
 {
     Q_OBJECT
@@ -135,9 +137,9 @@ QtGradientEditorPrivate::QtGradientEditorPrivate(QtGradientEditor *q)
     connect(m_gradientStopsController, &QtGradientStopsController::gradientStopsChanged,
             this, &QtGradientEditorPrivate::slotGradientStopsChanged);
 
-    QIcon iconLinear(QLatin1String(":/qt-project.org/qtgradienteditor/images/typelinear.png"));
-    QIcon iconRadial(QLatin1String(":/qt-project.org/qtgradienteditor/images/typeradial.png"));
-    QIcon iconConical(QLatin1String(":/qt-project.org/qtgradienteditor/images/typeconical.png"));
+    QIcon iconLinear(":/qt-project.org/qtgradienteditor/images/typelinear.png"_L1);
+    QIcon iconRadial(":/qt-project.org/qtgradienteditor/images/typeradial.png"_L1);
+    QIcon iconConical(":/qt-project.org/qtgradienteditor/images/typeconical.png"_L1);
 
     m_ui.typeComboBox->addItem(iconLinear, QtGradientEditor::tr("Linear"));
     m_ui.typeComboBox->addItem(iconRadial, QtGradientEditor::tr("Radial"));
@@ -157,9 +159,9 @@ QtGradientEditorPrivate::QtGradientEditorPrivate(QtGradientEditor *q)
     connect(m_ui.typeComboBox, &QComboBox::activated,
             this, &QtGradientEditorPrivate::slotTypeChanged);
 
-    QIcon iconPad(QLatin1String(":/qt-project.org/qtgradienteditor/images/spreadpad.png"));
-    QIcon iconRepeat(QLatin1String(":/qt-project.org/qtgradienteditor/images/spreadrepeat.png"));
-    QIcon iconReflect(QLatin1String(":/qt-project.org/qtgradienteditor/images/spreadreflect.png"));
+    QIcon iconPad(":/qt-project.org/qtgradienteditor/images/spreadpad.png"_L1);
+    QIcon iconRepeat(":/qt-project.org/qtgradienteditor/images/spreadrepeat.png"_L1);
+    QIcon iconReflect(":/qt-project.org/qtgradienteditor/images/spreadreflect.png"_L1);
 
     m_ui.spreadComboBox->addItem(iconPad, QtGradientEditor::tr("Pad"));
     m_ui.spreadComboBox->addItem(iconRepeat, QtGradientEditor::tr("Repeat"));
diff --git a/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp b/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
index 4d89af7b2..b3949590d 100644
--- a/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
+++ b/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp
@@ -9,6 +9,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QtGradientStopsControllerPrivate : public QObject
 {
     Q_OBJECT
@@ -127,8 +129,8 @@ void QtGradientStopsControllerPrivate::setUi(Ui::QtGradientEditor *ui)
             this, &QtGradientStopsControllerPrivate::slotRgbClicked);
 
     enableCurrent(false);
-    m_ui->zoomInButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/zoomin.png")));
-    m_ui->zoomOutButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/zoomout.png")));
+    m_ui->zoomInButton->setIcon(QIcon(":/qt-project.org/qtgradienteditor/images/zoomin.png"_L1));
+    m_ui->zoomOutButton->setIcon(QIcon(":/qt-project.org/qtgradienteditor/images/zoomout.png"_L1));
     updateZoom(1);
 }
 
diff --git a/src/shared/qtgradienteditor/qtgradientutils.cpp b/src/shared/qtgradienteditor/qtgradientutils.cpp
index 1ac43ceb0..625f1b159 100644
--- a/src/shared/qtgradienteditor/qtgradientutils.cpp
+++ b/src/shared/qtgradienteditor/qtgradientutils.cpp
@@ -11,24 +11,26 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QString gradientTypeToString(QGradient::Type type)
 {
     if (type == QGradient::LinearGradient)
-        return QLatin1String("LinearGradient");
+        return "LinearGradient"_L1;
     if (type == QGradient::RadialGradient)
-        return QLatin1String("RadialGradient");
+        return "RadialGradient"_L1;
     if (type == QGradient::ConicalGradient)
-        return QLatin1String("ConicalGradient");
-    return QLatin1String("NoGradient");
+        return "ConicalGradient"_L1;
+    return "NoGradient"_L1;
 }
 
 static QGradient::Type stringToGradientType(const QString &name)
 {
-    if (name == QLatin1String("LinearGradient"))
+    if (name == "LinearGradient"_L1)
         return QGradient::LinearGradient;
-    if (name == QLatin1String("RadialGradient"))
+    if (name == "RadialGradient"_L1)
         return QGradient::RadialGradient;
-    if (name == QLatin1String("ConicalGradient"))
+    if (name == "ConicalGradient"_L1)
         return QGradient::ConicalGradient;
     return QGradient::NoGradient;
 }
@@ -36,21 +38,21 @@ static QGradient::Type stringToGradientType(const QString &name)
 static QString gradientSpreadToString(QGradient::Spread spread)
 {
     if (spread == QGradient::PadSpread)
-        return QLatin1String("PadSpread");
+        return "PadSpread"_L1;
     if (spread == QGradient::RepeatSpread)
-        return QLatin1String("RepeatSpread");
+        return "RepeatSpread"_L1;
     if (spread == QGradient::ReflectSpread)
-        return QLatin1String("ReflectSpread");
-    return QLatin1String("PadSpread");
+        return "ReflectSpread"_L1;
+    return "PadSpread"_L1;
 }
 
 static QGradient::Spread stringToGradientSpread(const QString &name)
 {
-    if (name == QLatin1String("PadSpread"))
+    if (name == "PadSpread"_L1)
         return QGradient::PadSpread;
-    if (name == QLatin1String("RepeatSpread"))
+    if (name == "RepeatSpread"_L1)
         return QGradient::RepeatSpread;
-    if (name == QLatin1String("ReflectSpread"))
+    if (name == "ReflectSpread"_L1)
         return QGradient::ReflectSpread;
     return QGradient::PadSpread;
 }
@@ -58,42 +60,42 @@ static QGradient::Spread stringToGradientSpread(const QString &name)
 static QString gradientCoordinateModeToString(QGradient::CoordinateMode mode)
 {
     if (mode == QGradient::LogicalMode)
-        return QLatin1String("LogicalMode");
+        return "LogicalMode"_L1;
     if (mode == QGradient::StretchToDeviceMode)
-        return QLatin1String("StretchToDeviceMode");
+        return "StretchToDeviceMode"_L1;
     if (mode == QGradient::ObjectBoundingMode)
-        return QLatin1String("ObjectBoundingMode");
-    return QLatin1String("StretchToDeviceMode");
+        return "ObjectBoundingMode"_L1;
+    return "StretchToDeviceMode"_L1;
 }
 
 static QGradient::CoordinateMode stringToGradientCoordinateMode(const QString &name)
 {
-    if (name == QLatin1String("LogicalMode"))
+    if (name == "LogicalMode"_L1)
         return QGradient::LogicalMode;
-    if (name == QLatin1String("StretchToDeviceMode"))
+    if (name == "StretchToDeviceMode"_L1)
         return QGradient::StretchToDeviceMode;
-    if (name == QLatin1String("ObjectBoundingMode"))
+    if (name == "ObjectBoundingMode"_L1)
         return QGradient::ObjectBoundingMode;
     return QGradient::StretchToDeviceMode;
 }
 
 static QDomElement saveColor(QDomDocument &doc, const QColor &color)
 {
-    QDomElement colorElem = doc.createElement(QLatin1String("colorData"));
+    QDomElement colorElem = doc.createElement("colorData"_L1);
 
-    colorElem.setAttribute(QLatin1String("r"), QString::number(color.red()));
-    colorElem.setAttribute(QLatin1String("g"), QString::number(color.green()));
-    colorElem.setAttribute(QLatin1String("b"), QString::number(color.blue()));
-    colorElem.setAttribute(QLatin1String("a"), QString::number(color.alpha()));
+    colorElem.setAttribute("r"_L1, QString::number(color.red()));
+    colorElem.setAttribute("g"_L1, QString::number(color.green()));
+    colorElem.setAttribute("b"_L1, QString::number(color.blue()));
+    colorElem.setAttribute("a"_L1, QString::number(color.alpha()));
 
     return colorElem;
 }
 
 static QDomElement saveGradientStop(QDomDocument &doc, const QGradientStop &stop)
 {
-    QDomElement stopElem = doc.createElement(QLatin1String("stopData"));
+    QDomElement stopElem = doc.createElement("stopData"_L1);
 
-    stopElem.setAttribute(QLatin1String("position"), QString::number(stop.first));
+    stopElem.setAttribute("position"_L1, QString::number(stop.first));
 
     const QDomElement colorElem = saveColor(doc, stop.second);
     stopElem.appendChild(colorElem);
@@ -103,12 +105,12 @@ static QDomElement saveGradientStop(QDomDocument &doc, const QGradientStop &stop
 
 static QDomElement saveGradient(QDomDocument &doc, const QGradient &gradient)
 {
-    QDomElement gradElem = doc.createElement(QLatin1String("gradientData"));
+    QDomElement gradElem = doc.createElement("gradientData"_L1);
 
     const QGradient::Type type = gradient.type();
-    gradElem.setAttribute(QLatin1String("type"), gradientTypeToString(type));
-    gradElem.setAttribute(QLatin1String("spread"), gradientSpreadToString(gradient.spread()));
-    gradElem.setAttribute(QLatin1String("coordinateMode"), gradientCoordinateModeToString(gradient.coordinateMode()));
+    gradElem.setAttribute("type"_L1, gradientTypeToString(type));
+    gradElem.setAttribute("spread"_L1, gradientSpreadToString(gradient.spread()));
+    gradElem.setAttribute("coordinateMode"_L1, gradientCoordinateModeToString(gradient.coordinateMode()));
 
     const QGradientStops stops = gradient.stops();
     for (const QGradientStop &stop : stops)
@@ -116,22 +118,22 @@ static QDomElement saveGradient(QDomDocument &doc, const QGradient &gradient)
 
     if (type == QGradient::LinearGradient) {
         const QLinearGradient &g = *static_cast<const QLinearGradient *>(&gradient);
-        gradElem.setAttribute(QLatin1String("startX"), QString::number(g.start().x()));
-        gradElem.setAttribute(QLatin1String("startY"), QString::number(g.start().y()));
-        gradElem.setAttribute(QLatin1String("endX"), QString::number(g.finalStop().x()));
-        gradElem.setAttribute(QLatin1String("endY"), QString::number(g.finalStop().y()));
+        gradElem.setAttribute("startX"_L1, QString::number(g.start().x()));
+        gradElem.setAttribute("startY"_L1, QString::number(g.start().y()));
+        gradElem.setAttribute("endX"_L1, QString::number(g.finalStop().x()));
+        gradElem.setAttribute("endY"_L1, QString::number(g.finalStop().y()));
     } else if (type == QGradient::RadialGradient) {
         const QRadialGradient &g = *static_cast<const QRadialGradient *>(&gradient);
-        gradElem.setAttribute(QLatin1String("centerX"), QString::number(g.center().x()));
-        gradElem.setAttribute(QLatin1String("centerY"), QString::number(g.center().y()));
-        gradElem.setAttribute(QLatin1String("focalX"), QString::number(g.focalPoint().x()));
-        gradElem.setAttribute(QLatin1String("focalY"), QString::number(g.focalPoint().y()));
-        gradElem.setAttribute(QLatin1String("radius"), QString::number(g.radius()));
+        gradElem.setAttribute("centerX"_L1, QString::number(g.center().x()));
+        gradElem.setAttribute("centerY"_L1, QString::number(g.center().y()));
+        gradElem.setAttribute("focalX"_L1, QString::number(g.focalPoint().x()));
+        gradElem.setAttribute("focalY"_L1, QString::number(g.focalPoint().y()));
+        gradElem.setAttribute("radius"_L1, QString::number(g.radius()));
     } else if (type == QGradient::ConicalGradient) {
         const QConicalGradient &g = *static_cast<const QConicalGradient*>(&gradient);
-        gradElem.setAttribute(QLatin1String("centerX"), QString::number(g.center().x()));
-        gradElem.setAttribute(QLatin1String("centerY"), QString::number(g.center().y()));
-        gradElem.setAttribute(QLatin1String("angle"), QString::number(g.angle()));
+        gradElem.setAttribute("centerX"_L1, QString::number(g.center().x()));
+        gradElem.setAttribute("centerY"_L1, QString::number(g.center().y()));
+        gradElem.setAttribute("angle"_L1, QString::number(g.angle()));
     }
 
     return gradElem;
@@ -139,50 +141,50 @@ static QDomElement saveGradient(QDomDocument &doc, const QGradient &gradient)
 
 static QColor loadColor(const QDomElement &elem)
 {
-    if (elem.tagName() != QLatin1String("colorData"))
+    if (elem.tagName() != "colorData"_L1)
         return QColor();
 
-    return QColor(elem.attribute(QLatin1String("r")).toInt(),
-            elem.attribute(QLatin1String("g")).toInt(),
-            elem.attribute(QLatin1String("b")).toInt(),
-            elem.attribute(QLatin1String("a")).toInt());
+    return QColor(elem.attribute("r"_L1).toInt(),
+            elem.attribute("g"_L1).toInt(),
+            elem.attribute("b"_L1).toInt(),
+            elem.attribute("a"_L1).toInt());
 }
 
 static QGradientStop loadGradientStop(const QDomElement &elem)
 {
-    if (elem.tagName() != QLatin1String("stopData"))
+    if (elem.tagName() != "stopData"_L1)
         return QGradientStop();
 
-    const qreal pos = static_cast<qreal>(elem.attribute(QLatin1String("position")).toDouble());
+    const qreal pos = static_cast<qreal>(elem.attribute("position"_L1).toDouble());
     return qMakePair(pos, loadColor(elem.firstChild().toElement()));
 }
 
 static QGradient loadGradient(const QDomElement &elem)
 {
-    if (elem.tagName() != QLatin1String("gradientData"))
+    if (elem.tagName() != "gradientData"_L1)
         return QLinearGradient();
 
-    const QGradient::Type type = stringToGradientType(elem.attribute(QLatin1String("type")));
-    const QGradient::Spread spread = stringToGradientSpread(elem.attribute(QLatin1String("spread")));
-    const QGradient::CoordinateMode mode = stringToGradientCoordinateMode(elem.attribute(QLatin1String("coordinateMode")));
+    const QGradient::Type type = stringToGradientType(elem.attribute("type"_L1));
+    const QGradient::Spread spread = stringToGradientSpread(elem.attribute("spread"_L1));
+    const QGradient::CoordinateMode mode = stringToGradientCoordinateMode(elem.attribute("coordinateMode"_L1));
 
     QGradient gradient = QLinearGradient();
 
     if (type == QGradient::LinearGradient) {
         QLinearGradient g;
-        g.setStart(elem.attribute(QLatin1String("startX")).toDouble(), elem.attribute(QLatin1String("startY")).toDouble());
-        g.setFinalStop(elem.attribute(QLatin1String("endX")).toDouble(), elem.attribute(QLatin1String("endY")).toDouble());
+        g.setStart(elem.attribute("startX"_L1).toDouble(), elem.attribute("startY"_L1).toDouble());
+        g.setFinalStop(elem.attribute("endX"_L1).toDouble(), elem.attribute("endY"_L1).toDouble());
         gradient = g;
     } else if (type == QGradient::RadialGradient) {
         QRadialGradient g;
-        g.setCenter(elem.attribute(QLatin1String("centerX")).toDouble(), elem.attribute(QLatin1String("centerY")).toDouble());
-        g.setFocalPoint(elem.attribute(QLatin1String("focalX")).toDouble(), elem.attribute(QLatin1String("focalY")).toDouble());
-        g.setRadius(elem.attribute(QLatin1String("radius")).toDouble());
+        g.setCenter(elem.attribute("centerX"_L1).toDouble(), elem.attribute("centerY"_L1).toDouble());
+        g.setFocalPoint(elem.attribute("focalX"_L1).toDouble(), elem.attribute("focalY"_L1).toDouble());
+        g.setRadius(elem.attribute("radius"_L1).toDouble());
         gradient = g;
     } else if (type == QGradient::ConicalGradient) {
         QConicalGradient g;
-        g.setCenter(elem.attribute(QLatin1String("centerX")).toDouble(), elem.attribute(QLatin1String("centerY")).toDouble());
-        g.setAngle(elem.attribute(QLatin1String("angle")).toDouble());
+        g.setCenter(elem.attribute("centerX"_L1).toDouble(), elem.attribute("centerY"_L1).toDouble());
+        g.setAngle(elem.attribute("angle"_L1).toDouble());
         gradient = g;
     }
 
@@ -205,12 +207,12 @@ QString QtGradientUtils::saveState(const QtGradientManager *manager)
 {
     QDomDocument doc;
 
-    QDomElement rootElem = doc.createElement(QLatin1String("gradients"));
+    QDomElement rootElem = doc.createElement("gradients"_L1);
 
     QMap<QString, QGradient> grads = manager->gradients();
     for (auto itGrad = grads.cbegin(), end = grads.cend(); itGrad != end; ++itGrad) {
-        QDomElement idElem = doc.createElement(QLatin1String("gradient"));
-        idElem.setAttribute(QLatin1String("name"), itGrad.key());
+        QDomElement idElem = doc.createElement("gradient"_L1);
+        idElem.setAttribute("name"_L1, itGrad.key());
         QDomElement gradElem = saveGradient(doc, itGrad.value());
         idElem.appendChild(gradElem);
 
@@ -233,7 +235,7 @@ void QtGradientUtils::restoreState(QtGradientManager *manager, const QString &st
 
     QDomElement gradElem = rootElem.firstChildElement();
     while (!gradElem.isNull()) {
-        const QString name = gradElem.attribute(QLatin1String("name"));
+        const QString name = gradElem.attribute("name"_L1);
         const QGradient gradient = loadGradient(gradElem.firstChildElement());
 
         manager->addGradient(name, gradient);
@@ -279,13 +281,13 @@ static QString styleSheetFillName(const QGradient &gradient)
 
     switch (gradient.type()) {
         case QGradient::LinearGradient:
-            result += QLatin1String("qlineargradient");
+            result += "qlineargradient"_L1;
             break;
         case QGradient::RadialGradient:
-            result += QLatin1String("qradialgradient");
+            result += "qradialgradient"_L1;
             break;
         case QGradient::ConicalGradient:
-            result += QLatin1String("qconicalgradient");
+            result += "qconicalgradient"_L1;
             break;
         default:
             qWarning() << "QtGradientUtils::styleSheetFillName(): gradient type" << gradient.type() << "not supported!";
@@ -303,44 +305,44 @@ static QStringList styleSheetParameters(const QGradient &gradient)
         QString spread;
         switch (gradient.spread()) {
             case QGradient::PadSpread:
-                spread = QLatin1String("pad");
+                spread = "pad"_L1;
                 break;
             case QGradient::ReflectSpread:
-                spread = QLatin1String("reflect");
+                spread = "reflect"_L1;
                 break;
             case QGradient::RepeatSpread:
-                spread = QLatin1String("repeat");
+                spread = "repeat"_L1;
                 break;
             default:
                 qWarning() << "QtGradientUtils::styleSheetParameters(): gradient spread" << gradient.spread() << "not supported!";
                 break;
         }
-        result << QLatin1String("spread:") + spread;
+        result << "spread:"_L1 + spread;
     }
 
     switch (gradient.type()) {
         case QGradient::LinearGradient: {
             const QLinearGradient *linearGradient = static_cast<const QLinearGradient*>(&gradient);
-            result << QLatin1String("x1:") + QString::number(linearGradient->start().x())
-                << QLatin1String("y1:")    + QString::number(linearGradient->start().y())
-                << QLatin1String("x2:")    + QString::number(linearGradient->finalStop().x())
-                << QLatin1String("y2:")    + QString::number(linearGradient->finalStop().y());
+            result << "x1:"_L1 + QString::number(linearGradient->start().x())
+                << "y1:"_L1    + QString::number(linearGradient->start().y())
+                << "x2:"_L1    + QString::number(linearGradient->finalStop().x())
+                << "y2:"_L1    + QString::number(linearGradient->finalStop().y());
             break;
         }
         case QGradient::RadialGradient: {
             const QRadialGradient *radialGradient = static_cast<const QRadialGradient*>(&gradient);
-            result << QLatin1String("cx:")  + QString::number(radialGradient->center().x())
-                << QLatin1String("cy:")     + QString::number(radialGradient->center().y())
-                << QLatin1String("radius:") + QString::number(radialGradient->radius())
-                << QLatin1String("fx:")     + QString::number(radialGradient->focalPoint().x())
-                << QLatin1String("fy:")     + QString::number(radialGradient->focalPoint().y());
+            result << "cx:"_L1  + QString::number(radialGradient->center().x())
+                << "cy:"_L1     + QString::number(radialGradient->center().y())
+                << "radius:"_L1 + QString::number(radialGradient->radius())
+                << "fx:"_L1     + QString::number(radialGradient->focalPoint().x())
+                << "fy:"_L1     + QString::number(radialGradient->focalPoint().y());
             break;
         }
         case QGradient::ConicalGradient: {
             const QConicalGradient *conicalGradient = static_cast<const QConicalGradient*>(&gradient);
-            result << QLatin1String("cx:") + QString::number(conicalGradient->center().x())
-                << QLatin1String("cy:")    + QString::number(conicalGradient->center().y())
-                << QLatin1String("angle:") + QString::number(conicalGradient->angle());
+            result << "cx:"_L1 + QString::number(conicalGradient->center().x())
+                << "cy:"_L1    + QString::number(conicalGradient->center().y())
+                << "angle:"_L1 + QString::number(conicalGradient->angle());
             break;
         }
         default:
@@ -358,10 +360,10 @@ static QStringList styleSheetStops(const QGradient &gradient)
     for (const QGradientStop &stop : stops) {
         const QColor color = stop.second;
 
-        const QString stopDescription = QLatin1String("stop:") + QString::number(stop.first) + QLatin1String(" rgba(")
-                + QString::number(color.red()) + QLatin1String(", ")
-                + QString::number(color.green()) + QLatin1String(", ")
-                + QString::number(color.blue()) + QLatin1String(", ")
+        const QString stopDescription = "stop:"_L1 + QString::number(stop.first) + " rgba("_L1
+                + QString::number(color.red()) + ", "_L1
+                + QString::number(color.green()) + ", "_L1
+                + QString::number(color.blue()) + ", "_L1
                 + QString::number(color.alpha()) + QLatin1Char(')');
         result << stopDescription;
     }
@@ -374,7 +376,7 @@ QString QtGradientUtils::styleSheetCode(const QGradient &gradient)
     QStringList gradientParameters;
     gradientParameters << styleSheetParameters(gradient) << styleSheetStops(gradient);
 
-    return styleSheetFillName(gradient) + QLatin1Char('(') + gradientParameters.join(QLatin1String(", ")) + QLatin1Char(')');
+    return styleSheetFillName(gradient) + QLatin1Char('(') + gradientParameters.join(", "_L1) + QLatin1Char(')');
 }
 
 QT_END_NAMESPACE
diff --git a/src/shared/qtgradienteditor/qtgradientview.cpp b/src/shared/qtgradienteditor/qtgradientview.cpp
index f63cd5ec2..b6828d967 100644
--- a/src/shared/qtgradienteditor/qtgradientview.cpp
+++ b/src/shared/qtgradienteditor/qtgradientview.cpp
@@ -14,6 +14,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 void QtGradientView::slotGradientAdded(const QString &id, const QGradient &gradient)
 {
     QListWidgetItem *item = new QListWidgetItem(QtGradientUtils::gradientPixmap(gradient), id, m_ui.listWidget);
@@ -170,10 +172,10 @@ QtGradientView::QtGradientView(QWidget *parent)
     connect(m_ui.listWidget, &QListWidget::itemChanged, this, &QtGradientView::slotRenameGradientItem);
     connect(m_ui.listWidget, &QListWidget::currentItemChanged, this, &QtGradientView::slotCurrentItemChanged);
 
-    m_newAction = new QAction(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/plus.png")), tr("New..."), this);
-    m_editAction = new QAction(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/edit.png")), tr("Edit..."), this);
+    m_newAction = new QAction(QIcon(":/qt-project.org/qtgradienteditor/images/plus.png"_L1), tr("New..."), this);
+    m_editAction = new QAction(QIcon(":/qt-project.org/qtgradienteditor/images/edit.png"_L1), tr("Edit..."), this);
     m_renameAction = new QAction(tr("Rename"), this);
-    m_removeAction = new QAction(QIcon(QLatin1String(":/qt-project.org/qtgradienteditor/images/minus.png")), tr("Remove"), this);
+    m_removeAction = new QAction(QIcon(":/qt-project.org/qtgradienteditor/images/minus.png"_L1), tr("Remove"), this);
 
     connect(m_newAction, &QAction::triggered, this, &QtGradientView::slotNewGradient);
     connect(m_editAction, &QAction::triggered, this, &QtGradientView::slotEditGradient);
diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
index 9b47132e6..9d6aca901 100644
--- a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
@@ -13,6 +13,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // Make sure icons are removed as soon as QApplication is destroyed, otherwise,
 // handles are leaked on X11.
 static void clearCursorDatabase()
@@ -25,43 +27,43 @@ QtCursorDatabase::QtCursorDatabase()
     qAddPostRoutine(clearCursorDatabase);
 
     appendCursor(Qt::ArrowCursor, QCoreApplication::translate("QtCursorDatabase", "Arrow"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-arrow.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-arrow.png"_L1));
     appendCursor(Qt::UpArrowCursor, QCoreApplication::translate("QtCursorDatabase", "Up Arrow"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-uparrow.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-uparrow.png"_L1));
     appendCursor(Qt::CrossCursor, QCoreApplication::translate("QtCursorDatabase", "Cross"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-cross.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-cross.png"_L1));
     appendCursor(Qt::WaitCursor, QCoreApplication::translate("QtCursorDatabase", "Wait"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-wait.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-wait.png"_L1));
     appendCursor(Qt::IBeamCursor, QCoreApplication::translate("QtCursorDatabase", "IBeam"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-ibeam.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-ibeam.png"_L1));
     appendCursor(Qt::SizeVerCursor, QCoreApplication::translate("QtCursorDatabase", "Size Vertical"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizev.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-sizev.png"_L1));
     appendCursor(Qt::SizeHorCursor, QCoreApplication::translate("QtCursorDatabase", "Size Horizontal"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizeh.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-sizeh.png"_L1));
     appendCursor(Qt::SizeFDiagCursor, QCoreApplication::translate("QtCursorDatabase", "Size Backslash"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizef.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-sizef.png"_L1));
     appendCursor(Qt::SizeBDiagCursor, QCoreApplication::translate("QtCursorDatabase", "Size Slash"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizeb.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-sizeb.png"_L1));
     appendCursor(Qt::SizeAllCursor, QCoreApplication::translate("QtCursorDatabase", "Size All"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-sizeall.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-sizeall.png"_L1));
     appendCursor(Qt::BlankCursor, QCoreApplication::translate("QtCursorDatabase", "Blank"),
                  QIcon());
     appendCursor(Qt::SplitVCursor, QCoreApplication::translate("QtCursorDatabase", "Split Vertical"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-vsplit.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-vsplit.png"_L1));
     appendCursor(Qt::SplitHCursor, QCoreApplication::translate("QtCursorDatabase", "Split Horizontal"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-hsplit.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-hsplit.png"_L1));
     appendCursor(Qt::PointingHandCursor, QCoreApplication::translate("QtCursorDatabase", "Pointing Hand"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-hand.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-hand.png"_L1));
     appendCursor(Qt::ForbiddenCursor, QCoreApplication::translate("QtCursorDatabase", "Forbidden"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-forbidden.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-forbidden.png"_L1));
     appendCursor(Qt::OpenHandCursor, QCoreApplication::translate("QtCursorDatabase", "Open Hand"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-openhand.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-openhand.png"_L1));
     appendCursor(Qt::ClosedHandCursor, QCoreApplication::translate("QtCursorDatabase", "Closed Hand"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-closedhand.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-closedhand.png"_L1));
     appendCursor(Qt::WhatsThisCursor, QCoreApplication::translate("QtCursorDatabase", "What's This"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-whatsthis.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-whatsthis.png"_L1));
     appendCursor(Qt::BusyCursor, QCoreApplication::translate("QtCursorDatabase", "Busy"),
-                 QIcon(QLatin1String(":/qt-project.org/qtpropertybrowser/images/cursor-busy.png")));
+                 QIcon(":/qt-project.org/qtpropertybrowser/images/cursor-busy.png"_L1));
 }
 
 void QtCursorDatabase::clear()
@@ -197,7 +199,7 @@ QString QtPropertyBrowserUtils::dateFormat()
     QString format = loc.dateFormat(QLocale::ShortFormat);
     // Change dd.MM.yy, MM/dd/yy to 4 digit years
     if (format.count(QLatin1Char('y')) == 2)
-        format.insert(format.indexOf(QLatin1Char('y')), QLatin1String("yy"));
+        format.insert(format.indexOf(QLatin1Char('y')), "yy"_L1);
     return format;
 }
 
diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
index fd804888c..e5ed1bf41 100644
--- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp
+++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp
@@ -451,7 +451,7 @@ QtMetaEnumProvider::QtMetaEnumProvider()
     m_policyEnum = p.enumerator();
     const int keyCount = m_policyEnum.keyCount();
     for (int i = 0; i < keyCount; i++)
-        m_policyEnumNames << QLatin1String(m_policyEnum.key(i));
+        m_policyEnumNames << QLatin1StringView(m_policyEnum.key(i));
 
     initLocale();
 }
diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.cpp b/src/shared/qtpropertybrowser/qtvariantproperty.cpp
index a67f77060..6e3452349 100644
--- a/src/shared/qtpropertybrowser/qtvariantproperty.cpp
+++ b/src/shared/qtpropertybrowser/qtvariantproperty.cpp
@@ -17,6 +17,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 using QtIconMap = QMap<int, QIcon>;
 
 class QtEnumPropertyType
@@ -325,15 +327,15 @@ public:
 };
 
 QtVariantPropertyManagerPrivate::QtVariantPropertyManagerPrivate() :
-    m_constraintAttribute(QLatin1String("constraint")),
-    m_singleStepAttribute(QLatin1String("singleStep")),
-    m_decimalsAttribute(QLatin1String("decimals")),
-    m_enumIconsAttribute(QLatin1String("enumIcons")),
-    m_enumNamesAttribute(QLatin1String("enumNames")),
-    m_flagNamesAttribute(QLatin1String("flagNames")),
-    m_maximumAttribute(QLatin1String("maximum")),
-    m_minimumAttribute(QLatin1String("minimum")),
-    m_regExpAttribute(QLatin1String("regExp"))
+    m_constraintAttribute("constraint"_L1),
+    m_singleStepAttribute("singleStep"_L1),
+    m_decimalsAttribute("decimals"_L1),
+    m_enumIconsAttribute("enumIcons"_L1),
+    m_enumNamesAttribute("enumNames"_L1),
+    m_flagNamesAttribute("flagNames"_L1),
+    m_maximumAttribute("maximum"_L1),
+    m_minimumAttribute("minimum"_L1),
+    m_regExpAttribute("regExp"_L1)
 {
 }
 
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp
index ab215e181..622f23e82 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -17,6 +17,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QtFullToolBarManagerPrivate;
 
 class QtFullToolBarManager : public QObject
@@ -438,8 +440,7 @@ void QtFullToolBarManager::addAction(QAction *action, const QString &category)
         return;
     if (d_ptr->allActions.contains(action))
         return;
-    if (QLatin1String(action->metaObject()->className()) ==
-                QLatin1String("QToolBarWidgetAction"))
+    if (qstrcmp(action->metaObject()->className(), "QToolBarWidgetAction") == 0)
         d_ptr->widgetActions.insert(action, 0);
     else
         d_ptr->regularActions.insert(action);
@@ -562,7 +563,7 @@ QToolBar *QtFullToolBarManager::createToolBar(const QString &toolBarName)
         return 0;
     QToolBar *toolBar = new QToolBar(toolBarName, mainWindow());
     int i = 1;
-    const QString prefix = QLatin1String("_Custom_Toolbar_%1");
+    const QString prefix = "_Custom_Toolbar_%1"_L1;
     QString name = prefix.arg(i);
     while (d_ptr->toolBarByName(name))
         name = prefix.arg(++i);
@@ -1684,12 +1685,12 @@ QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WindowFlags flags)
     d_ptr->ui.actionTree->setRootIsDecorated(false);
     d_ptr->ui.actionTree->header()->hide();
 
-    d_ptr->ui.upButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/up.png")));
-    d_ptr->ui.downButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/down.png")));
-    d_ptr->ui.leftButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/back.png")));
-    d_ptr->ui.rightButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/forward.png")));
-    d_ptr->ui.newButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/plus.png")));
-    d_ptr->ui.removeButton->setIcon(QIcon(QLatin1String(":/qt-project.org/qttoolbardialog/images/minus.png")));
+    d_ptr->ui.upButton->setIcon(QIcon(":/qt-project.org/qttoolbardialog/images/up.png"_L1));
+    d_ptr->ui.downButton->setIcon(QIcon(":/qt-project.org/qttoolbardialog/images/down.png"_L1));
+    d_ptr->ui.leftButton->setIcon(QIcon(":/qt-project.org/qttoolbardialog/images/back.png"_L1));
+    d_ptr->ui.rightButton->setIcon(QIcon(":/qt-project.org/qttoolbardialog/images/forward.png"_L1));
+    d_ptr->ui.newButton->setIcon(QIcon(":/qt-project.org/qttoolbardialog/images/plus.png"_L1));
+    d_ptr->ui.removeButton->setIcon(QIcon(":/qt-project.org/qttoolbardialog/images/minus.png"_L1));
 
     connect(d_ptr->ui.newButton, &QAbstractButton::clicked, this, [this] { d_ptr->newClicked(); });
     connect(d_ptr->ui.removeButton, &QAbstractButton::clicked, this, [this] { d_ptr->removeClicked(); });
author	Friedemann Kleint <Friedemann.Kleint@qt.io>	2023-07-24 12:00:46 +0200
committer	Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-07-25 09:35:44 +0000
commit	56eaef5121453c8fe106062b23f6467404f211a9 (patch)
tree	e4d1e16bbe65c36ac14e81af8a483466ea68f9e9
parent	0d34f7667071530f9eaf648942f64b65db78142d (diff)