Qt Designer: Replace QString::fromUtf8() by modern literals

Change-Id: If0aff3c1a767e6830f5480f57dfe82a66feb124c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit c59546f2782fa1a7add12dfdf4c4a32951608f29)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

19 files changed, 76 insertions, 62 deletions

diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
index d89b09d0d..21fe9928d 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -33,6 +33,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace qdesigner_internal {
 
 using DeviceProfileList = QList<DeviceProfile>;
@@ -123,7 +125,7 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q)
     EmbeddedOptionsControl::connect(m_profileCombo, &QComboBox::currentIndexChanged,
                                     m_q, &EmbeddedOptionsControl::slotProfileIndexChanged);
 
-    m_addButton->setIcon(createIconSet(QString::fromUtf8("plus.png")));
+    m_addButton->setIcon(createIconSet(u"plus.png"_s));
     m_addButton->setToolTip(EmbeddedOptionsControl::tr("Add a profile"));
     EmbeddedOptionsControl::connect(m_addButton, &QAbstractButton::clicked,
                                     m_q, &EmbeddedOptionsControl::slotAdd);
@@ -131,11 +133,11 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q)
 
     EmbeddedOptionsControl::connect(m_editButton, &QAbstractButton::clicked,
                                     m_q, &EmbeddedOptionsControl::slotEdit);
-    m_editButton->setIcon(createIconSet(QString::fromUtf8("edit.png")));
+    m_editButton->setIcon(createIconSet(u"edit.png"_s));
     m_editButton->setToolTip(EmbeddedOptionsControl::tr("Edit the selected profile"));
     hLayout->addWidget(m_editButton);
 
-    m_deleteButton->setIcon(createIconSet(QString::fromUtf8("minus.png")));
+    m_deleteButton->setIcon(createIconSet(u"minus.png"_s));
     m_deleteButton->setToolTip(EmbeddedOptionsControl::tr("Delete the selected profile"));
     EmbeddedOptionsControl::connect(m_deleteButton, &QAbstractButton::clicked,
                                     m_q, &EmbeddedOptionsControl::slotDelete);
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 4f7832b79..719d55ddc 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -2207,7 +2207,7 @@ void QDesignerResource::applyAttributesToPropertySheet(const DomWidget *ui_widge
         const QString name = prop->attributeName();
         const int index = sheet->indexOf(name);
         if (index == -1) {
-            const QString msg = QString::fromUtf8("Unable to apply attributive property '%1' to '%2'. It does not exist.").arg(name, widget->objectName());
+            const QString msg = "Unable to apply attributive property '%1' to '%2'. It does not exist."_L1.arg(name, widget->objectName());
             designerWarning(msg);
         } else {
             sheet->setProperty(index, domPropertyToVariant(this, widget->metaObject(), prop));
diff --git a/src/designer/src/components/formeditor/templateoptionspage.cpp b/src/designer/src/components/formeditor/templateoptionspage.cpp
index ca797a663..22191565b 100644
--- a/src/designer/src/components/formeditor/templateoptionspage.cpp
+++ b/src/designer/src/components/formeditor/templateoptionspage.cpp
@@ -25,9 +25,9 @@ TemplateOptionsWidget::TemplateOptionsWidget(QDesignerFormEditorInterface *core,
     m_ui->setupUi(this);
 
     m_ui->m_addTemplatePathButton->setIcon(
-            qdesigner_internal::createIconSet(QString::fromUtf8("plus.png")));
+            qdesigner_internal::createIconSet(u"plus.png"_s));
     m_ui->m_removeTemplatePathButton->setIcon(
-            qdesigner_internal::createIconSet(QString::fromUtf8("minus.png")));
+            qdesigner_internal::createIconSet(u"minus.png"_s));
 
     connect(m_ui->m_templatePathListWidget, &QListWidget::itemSelectionChanged,
             this, &TemplateOptionsWidget::templatePathSelectionChanged);
diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
index 9ab6954ea..e0f2f888a 100644
--- a/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/fontpropertymanager.cpp
@@ -265,7 +265,7 @@ namespace qdesigner_internal {
 
     static QString msgXmlError(const QXmlStreamReader &r, const QString& fileName)
     {
-        return QString::fromUtf8("An error has been encountered at line %1 of %2: %3:").arg(r.lineNumber()).arg(fileName, r.errorString());
+        return u"An error has been encountered at line %1 of %2: %3:"_s.arg(r.lineNumber()).arg(fileName, r.errorString());
     }
 
     /* Switch stages when encountering a start element (state table) */
@@ -296,7 +296,7 @@ namespace qdesigner_internal {
         const QString fileName = u":/qt-project.org/propertyeditor/fontmapping.xml"_s;
         QFile file(fileName);
         if (!file.open(QIODevice::ReadOnly)) {
-            *errorMessage = QString::fromUtf8("Unable to open %1: %2").arg(fileName, file.errorString());
+            *errorMessage = "Unable to open %1: %2"_L1.arg(fileName, file.errorString());
             return false;
         }
 
@@ -315,7 +315,7 @@ namespace qdesigner_internal {
                 stage = nextStage(stage, reader.name());
                 switch (stage) {
                 case ParseError:
-                    reader.raiseError(QString::fromUtf8("Unexpected element <%1>.").arg(reader.name().toString()));
+                    reader.raiseError("Unexpected element <%1>."_L1.arg(reader.name()));
                     *errorMessage = msgXmlError(reader, fileName);
                     return false;
                 case ParseWithinFamily:
diff --git a/src/designer/src/components/propertyeditor/stringlisteditor.cpp b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
index 7081544dc..dc99e758c 100644
--- a/src/designer/src/components/propertyeditor/stringlisteditor.cpp
+++ b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
@@ -7,6 +7,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace qdesigner_internal {
 
 StringListEditor::StringListEditor(QWidget *parent)
@@ -22,10 +24,10 @@ StringListEditor::StringListEditor(QWidget *parent)
             &QAbstractItemDelegate::closeEditor,
             this, &StringListEditor::currentValueChanged);
 
-    QIcon upIcon = createIconSet(QString::fromUtf8("up.png"));
-    QIcon downIcon = createIconSet(QString::fromUtf8("down.png"));
-    QIcon minusIcon = createIconSet(QString::fromUtf8("minus.png"));
-    QIcon plusIcon = createIconSet(QString::fromUtf8("plus.png"));
+    QIcon upIcon = createIconSet(u"up.png"_s);
+    QIcon downIcon = createIconSet(u"down.png"_s);
+    QIcon minusIcon = createIconSet(u"minus.png"_s);
+    QIcon plusIcon = createIconSet(u"plus.png"_s);
     upButton->setIcon(upIcon);
     downButton->setIcon(downIcon);
     newButton->setIcon(plusIcon);
diff --git a/src/designer/src/components/signalsloteditor/connectdialog.cpp b/src/designer/src/components/signalsloteditor/connectdialog.cpp
index 3edd9eb27..032e33f7a 100644
--- a/src/designer/src/components/signalsloteditor/connectdialog.cpp
+++ b/src/designer/src/components/signalsloteditor/connectdialog.cpp
@@ -17,6 +17,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QString realClassName(QDesignerFormEditorInterface *core, QWidget *widget)
 {
     QString class_name = QLatin1String(widget->metaObject()->className());
@@ -29,7 +31,7 @@ static QString realClassName(QDesignerFormEditorInterface *core, QWidget *widget
 
 static QString widgetLabel(QDesignerFormEditorInterface *core, QWidget *widget)
 {
-    return QString::fromUtf8("%1 (%2)")
+    return "%1 (%2)"_L1
             .arg(qdesigner_internal::realObjectName(core, widget),
                  realClassName(core, widget));
 }
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index 668769ef5..4fa4f1248 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -273,10 +273,10 @@ ItemListEditor::ItemListEditor(QDesignerFormWindowInterface *form, QWidget *pare
             this, &ItemListEditor::togglePropertyBrowser);
     setPropertyBrowserVisible(false);
 
-    QIcon upIcon = createIconSet(QString::fromUtf8("up.png"));
-    QIcon downIcon = createIconSet(QString::fromUtf8("down.png"));
-    QIcon minusIcon = createIconSet(QString::fromUtf8("minus.png"));
-    QIcon plusIcon = createIconSet(QString::fromUtf8("plus.png"));
+    QIcon upIcon = createIconSet(u"up.png"_s);
+    QIcon downIcon = createIconSet(u"down.png"_s);
+    QIcon minusIcon = createIconSet(u"minus.png"_s);
+    QIcon plusIcon = createIconSet(u"plus.png"_s);
     ui.moveListItemUpButton->setIcon(upIcon);
     ui.moveListItemDownButton->setIcon(downIcon);
     ui.newListItemButton->setIcon(plusIcon);
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
index e9c1b4678..844a1da20 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -40,13 +40,13 @@ TreeWidgetEditor::TreeWidgetEditor(QDesignerFormWindowInterface *form, QDialog *
     ui.tabWidget->insertTab(0, m_columnEditor, tr("&Columns"));
     ui.tabWidget->setCurrentIndex(0);
 
-    ui.newItemButton->setIcon(createIconSet(QString::fromUtf8("plus.png")));
-    ui.newSubItemButton->setIcon(createIconSet(QString::fromUtf8("downplus.png")));
-    ui.deleteItemButton->setIcon(createIconSet(QString::fromUtf8("minus.png")));
-    ui.moveItemUpButton->setIcon(createIconSet(QString::fromUtf8("up.png")));
-    ui.moveItemDownButton->setIcon(createIconSet(QString::fromUtf8("down.png")));
-    ui.moveItemRightButton->setIcon(createIconSet(QString::fromUtf8("leveldown.png")));
-    ui.moveItemLeftButton->setIcon(createIconSet(QString::fromUtf8("levelup.png")));
+    ui.newItemButton->setIcon(createIconSet(u"plus.png"_s));
+    ui.newSubItemButton->setIcon(createIconSet(u"downplus.png"_s));
+    ui.deleteItemButton->setIcon(createIconSet(u"minus.png"_s));
+    ui.moveItemUpButton->setIcon(createIconSet(u"up.png"_s));
+    ui.moveItemDownButton->setIcon(createIconSet(u"down.png"_s));
+    ui.moveItemRightButton->setIcon(createIconSet(u"leveldown.png"_s));
+    ui.moveItemLeftButton->setIcon(createIconSet(u"levelup.png"_s));
 
     ui.treeWidget->header()->setSectionsMovable(false);
 
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index f1ed82063..e14b40b33 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -30,6 +30,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 enum {FileNameRole = Qt::UserRole + 1, IdRole =  Qt::UserRole + 2 };
 enum { debugAppFontWidget = 0 };
 
@@ -252,16 +254,16 @@ AppFontWidget::AppFontWidget(QWidget *parent) :
     connect(m_view->selectionModel(), &QItemSelectionModel::selectionChanged, this, &AppFontWidget::selectionChanged);
 
     m_addButton->setToolTip(tr("Add font files"));
-    m_addButton->setIcon(qdesigner_internal::createIconSet(QString::fromUtf8("plus.png")));
+    m_addButton->setIcon(qdesigner_internal::createIconSet(u"plus.png"_s));
     connect(m_addButton, &QAbstractButton::clicked, this, &AppFontWidget::addFiles);
 
     m_removeButton->setEnabled(false);
     m_removeButton->setToolTip(tr("Remove current font file"));
-    m_removeButton->setIcon(qdesigner_internal::createIconSet(QString::fromUtf8("minus.png")));
+    m_removeButton->setIcon(qdesigner_internal::createIconSet(u"minus.png"_s));
     connect(m_removeButton, &QAbstractButton::clicked, this, &AppFontWidget::slotRemoveFiles);
 
     m_removeAllButton->setToolTip(tr("Remove all font files"));
-    m_removeAllButton->setIcon(qdesigner_internal::createIconSet(QString::fromUtf8("editdelete.png")));
+    m_removeAllButton->setIcon(qdesigner_internal::createIconSet(u"editdelete.png"_s));
     connect(m_removeAllButton, &QAbstractButton::clicked, this, &AppFontWidget::slotRemoveAll);
 
     QHBoxLayout *hLayout = new QHBoxLayout;
diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp
index e67e06cca..4789548a6 100644
--- a/src/designer/src/lib/shared/iconloader.cpp
+++ b/src/designer/src/lib/shared/iconloader.cpp
@@ -15,16 +15,18 @@ namespace qdesigner_internal {
 
 QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name)
 {
-    const QStringList candidates = QStringList()
-        << (QString::fromUtf8(":/qt-project.org/formeditor/images/") + name)
+    constexpr QLatin1StringView prefixes[] = {
+        ":/qt-project.org/formeditor/images/"_L1,
 #ifdef Q_OS_MACOS
-        << (QString::fromUtf8(":/qt-project.org/formeditor/images/mac/") + name)
+        ":/qt-project.org/formeditor/images/mac/"_L1,
 #else
-        << (QString::fromUtf8(":/qt-project.org/formeditor/images/win/") + name)
+        ":/qt-project.org/formeditor/images/win/"_L1,
 #endif
-        << (QString::fromUtf8(":/qt-project.org/formeditor/images/designer_") + name);
+        ":/qt-project.org/formeditor/images/designer_"_L1
+    };
 
-    for (const QString &f : candidates) {
+    for (QLatin1StringView prefix : prefixes) {
+        const QString f = prefix + name;
         if (QFile::exists(f))
             return QIcon(f);
     }
diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp
index 677f155eb..4ca634192 100644
--- a/src/designer/src/lib/shared/iconselector.cpp
+++ b/src/designer/src/lib/shared/iconselector.cpp
@@ -423,7 +423,7 @@ IconSelector::IconSelector(QWidget *parent) :
     d_ptr->m_resetAllAction = new QAction(tr("Reset All"), this);
     d_ptr->m_resetAction->setEnabled(false);
     d_ptr->m_resetAllAction->setEnabled(false);
-    //d_ptr->m_resetAction->setIcon(createIconSet(QString::fromUtf8("resetproperty.png")));
+    //d_ptr->m_resetAction->setIcon(createIconSet(u"resetproperty.png"_s));
 
     setMenu->addAction(setResourceAction);
     setMenu->addAction(setFileAction);
diff --git a/src/designer/src/lib/shared/orderdialog.cpp b/src/designer/src/lib/shared/orderdialog.cpp
index e0ad83e7a..cecfd35d0 100644
--- a/src/designer/src/lib/shared/orderdialog.cpp
+++ b/src/designer/src/lib/shared/orderdialog.cpp
@@ -13,6 +13,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // OrderDialog: Used to reorder the pages of QStackedWidget and QToolBox.
 // Provides up and down buttons as well as  DnD via QAbstractItemView::InternalMove mode
 namespace qdesigner_internal {
@@ -23,8 +25,8 @@ OrderDialog::OrderDialog(QWidget *parent) :
     m_format(PageOrderFormat)
 {
     m_ui->setupUi(this);
-    m_ui->upButton->setIcon(createIconSet(QString::fromUtf8("up.png")));
-    m_ui->downButton->setIcon(createIconSet(QString::fromUtf8("down.png")));
+    m_ui->upButton->setIcon(createIconSet(u"up.png"_s));
+    m_ui->downButton->setIcon(createIconSet(u"down.png"_s));
     m_ui->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
     connect(m_ui->buttonBox->button(QDialogButtonBox::Reset), &QAbstractButton::clicked,
             this, &OrderDialog::slotReset);
diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
index ba9f11e26..d32e0294b 100644
--- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp
+++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp
@@ -109,11 +109,11 @@ PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::PreviewConfigurat
 
     // sheet
     m_ui.m_appStyleSheetLineEdit->setTextPropertyValidationMode(qdesigner_internal::ValidationStyleSheet);
-    m_ui.m_appStyleSheetClearButton->setIcon(qdesigner_internal::createIconSet(QString::fromUtf8("resetproperty.png")));
+    m_ui.m_appStyleSheetClearButton->setIcon(qdesigner_internal::createIconSet(u"resetproperty.png"_s));
     QObject::connect(m_ui.m_appStyleSheetClearButton, &QAbstractButton::clicked,
                      m_ui.m_appStyleSheetLineEdit, &qdesigner_internal::TextPropertyEditor::clear);
 
-    m_ui.m_skinRemoveButton->setIcon(qdesigner_internal::createIconSet(QString::fromUtf8("editdelete.png")));
+    m_ui.m_skinRemoveButton->setIcon(qdesigner_internal::createIconSet(u"editdelete.png"_s));
     // skins: find default skins (resources)
     m_ui.m_skinRemoveButton->setEnabled(false);
     Skins skins = defaultSkins();
diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
index 5dc4e7d9c..004660891 100644
--- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
@@ -185,7 +185,7 @@ namespace qdesigner_internal {
         m_model(new PromotionModel(core)),
         m_treeView(new QTreeView),
         m_buttonBox(nullptr),
-        m_removeButton(new QPushButton(createIconSet(QString::fromUtf8("minus.png")), QString()))
+        m_removeButton(new QPushButton(createIconSet(u"minus.png"_s), QString()))
     {
         m_buttonBox = createButtonBox();
         setModal(true);
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
index abdf5f749..710da6e87 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -970,7 +970,7 @@ QString QDesignerPropertySheet::propertyGroup(int index) const
         return g;
 
     if (propertyType(index) == PropertyAccessibility)
-        return QString::fromUtf8("Accessibility");
+        return u"Accessibility"_s;
 
     if (isAdditionalProperty(index))
         return d->m_meta->className();
diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
index 30223bb11..588d7e3c7 100644
--- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp
+++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp
@@ -1899,13 +1899,13 @@ QtResourceEditorDialog::QtResourceEditorDialog(QDesignerFormEditorInterface *cor
     connect(d_ptr->m_qrcManager, &QtQrcManager::resourceFileRemoved,
             this, [this](QtResourceFile *file) { d_ptr->slotResourceFileRemoved(file); });
 
-    QIcon upIcon = qdesigner_internal::createIconSet(QString::fromUtf8("up.png"));
-    QIcon downIcon = qdesigner_internal::createIconSet(QString::fromUtf8("down.png"));
-    QIcon minusIcon = qdesigner_internal::createIconSet(QString::fromUtf8("minus-16.png"));
-    QIcon newIcon = qdesigner_internal::createIconSet(QString::fromUtf8("filenew-16.png"));
-    QIcon openIcon = qdesigner_internal::createIconSet(QString::fromUtf8("fileopen-16.png"));
-    QIcon removeIcon = qdesigner_internal::createIconSet(QString::fromUtf8("editdelete-16.png"));
-    QIcon addPrefixIcon = qdesigner_internal::createIconSet(QString::fromUtf8("prefix-add.png"));
+    QIcon upIcon = qdesigner_internal::createIconSet(u"up.png"_s);
+    QIcon downIcon = qdesigner_internal::createIconSet(u"down.png"_s);
+    QIcon minusIcon = qdesigner_internal::createIconSet(u"minus-16.png"_s);
+    QIcon newIcon = qdesigner_internal::createIconSet(u"filenew-16.png"_s);
+    QIcon openIcon = qdesigner_internal::createIconSet(u"fileopen-16.png"_s);
+    QIcon removeIcon = qdesigner_internal::createIconSet(u"editdelete-16.png"_s);
+    QIcon addPrefixIcon = qdesigner_internal::createIconSet(u"prefix-add.png"_s);
 
     d_ptr->m_newQrcFileAction = new QAction(newIcon, tr("New..."), this);
     d_ptr->m_newQrcFileAction->setToolTip(tr("New Resource File"));
diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp
index afb0ccd20..c9016df57 100644
--- a/src/designer/src/lib/shared/signalslotdialog.cpp
+++ b/src/designer/src/lib/shared/signalslotdialog.cpp
@@ -293,8 +293,8 @@ SignalSlotDialog::SignalSlotDialog(QDesignerDialogGuiInterface *dialogGui, QWidg
     setModal(true);
     m_ui->setupUi(this);
 
-    const QIcon plusIcon = qdesigner_internal::createIconSet(QString::fromUtf8("plus.png"));
-    const QIcon minusIcon = qdesigner_internal::createIconSet(QString::fromUtf8("minus.png"));
+    const QIcon plusIcon = qdesigner_internal::createIconSet(u"plus.png"_s);
+    const QIcon minusIcon = qdesigner_internal::createIconSet(u"minus.png"_s);
     m_ui->addSlotButton->setIcon(plusIcon);
     m_ui->removeSlotButton->setIcon(minusIcon);
     m_ui->addSignalButton->setIcon(plusIcon);
diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp
index 6f1453376..441c97887 100644
--- a/src/designer/src/lib/shared/widgetdatabase.cpp
+++ b/src/designer/src/lib/shared/widgetdatabase.cpp
@@ -33,6 +33,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 namespace {
     enum { debugWidgetDataBase = 0 };
 }
@@ -286,20 +288,20 @@ WidgetDataBase::WidgetDataBase(QDesignerFormEditorInterface *core, QObject *pare
     append(aivItem);
 #endif // QT_CONFIG(itemviews)
 
-    append(new WidgetDataBaseItem(QString::fromUtf8("Line")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("Spacer")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("QSplitter")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("QLayoutWidget")));
+    append(new WidgetDataBaseItem(u"Line"_s));
+    append(new WidgetDataBaseItem(u"Spacer"_s));
+    append(new WidgetDataBaseItem(u"QSplitter"_s));
+    append(new WidgetDataBaseItem(u"QLayoutWidget"_s));
     // QDesignerWidget is used as central widget and as container for tab widgets, etc.
-    WidgetDataBaseItem *designerWidgetItem = new WidgetDataBaseItem(QString::fromUtf8("QDesignerWidget"));
+    WidgetDataBaseItem *designerWidgetItem = new WidgetDataBaseItem(u"QDesignerWidget"_s);
     designerWidgetItem->setContainer(true);
     append(designerWidgetItem);
-    append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerDialog")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerMenu")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerMenuBar")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("QDesignerDockWidget")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("QAction")));
-    append(new WidgetDataBaseItem(QString::fromUtf8("QButtonGroup")));
+    append(new WidgetDataBaseItem(u"QDesignerDialog"_s));
+    append(new WidgetDataBaseItem(u"QDesignerMenu"_s));
+    append(new WidgetDataBaseItem(u"QDesignerMenuBar"_s));
+    append(new WidgetDataBaseItem(u"QDesignerDockWidget"_s));
+    append(new WidgetDataBaseItem(u"QAction"_s));
+    append(new WidgetDataBaseItem(u"QButtonGroup"_s));
 
     // ### remove me
     // ### check the casts
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index 560d8d6ce..b90876dbd 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -1426,7 +1426,7 @@ QList<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj)
             if (prop.isEnumType()) {
                 QString scope = QString::fromUtf8(prop.enumerator().scope());
                 if (scope.size())
-                    scope += QString::fromUtf8("::");
+                    scope += "::"_L1;
                 const QString e = QString::fromUtf8(prop.enumerator().valueToKey(v.toInt()));
                 if (e.size())
                     dom_prop->setElementEnum(scope + e);