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

Task-number: QTBUG-98434
Change-Id: I310ea8f19d73a79d985ebfb8bfbff7a02c424360
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

25 files changed, 134 insertions, 93 deletions

diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index 627dbaa1d6..5ac9988a36 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -68,6 +68,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QAbstractScrollArea
     \brief The QAbstractScrollArea widget provides a scrolling area with
@@ -282,11 +284,11 @@ void QAbstractScrollAreaPrivate::init()
 {
     Q_Q(QAbstractScrollArea);
     viewport = new QWidget(q);
-    viewport->setObjectName(QLatin1String("qt_scrollarea_viewport"));
+    viewport->setObjectName("qt_scrollarea_viewport"_L1);
     viewport->setBackgroundRole(QPalette::Base);
     viewport->setAutoFillBackground(true);
     scrollBarContainers[Qt::Horizontal] = new QAbstractScrollAreaScrollBarContainer(Qt::Horizontal, q);
-    scrollBarContainers[Qt::Horizontal]->setObjectName(QLatin1String("qt_scrollarea_hcontainer"));
+    scrollBarContainers[Qt::Horizontal]->setObjectName("qt_scrollarea_hcontainer"_L1);
     hbar = scrollBarContainers[Qt::Horizontal]->scrollBar;
     hbar->setRange(0,0);
     scrollBarContainers[Qt::Horizontal]->setVisible(false);
@@ -294,7 +296,7 @@ void QAbstractScrollAreaPrivate::init()
     QObject::connect(hbar, SIGNAL(valueChanged(int)), q, SLOT(_q_hslide(int)));
     QObject::connect(hbar, SIGNAL(rangeChanged(int,int)), q, SLOT(_q_showOrHideScrollBars()), Qt::QueuedConnection);
     scrollBarContainers[Qt::Vertical] = new QAbstractScrollAreaScrollBarContainer(Qt::Vertical, q);
-    scrollBarContainers[Qt::Vertical]->setObjectName(QLatin1String("qt_scrollarea_vcontainer"));
+    scrollBarContainers[Qt::Vertical]->setObjectName("qt_scrollarea_vcontainer"_L1);
     vbar = scrollBarContainers[Qt::Vertical]->scrollBar;
     vbar->setRange(0,0);
     scrollBarContainers[Qt::Vertical]->setVisible(false);
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 1850487a8a..09d4c0de35 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -72,6 +72,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QAbstractSpinBox
     \brief The QAbstractSpinBox class provides a spinbox and a line edit to
@@ -1096,7 +1098,7 @@ void QAbstractSpinBox::keyPressEvent(QKeyEvent *event)
 
     case Qt::Key_U:
         if (event->modifiers() & Qt::ControlModifier
-            && QGuiApplication::platformName() == QLatin1String("xcb")) { // only X11
+            && QGuiApplication::platformName() == "xcb"_L1) { // only X11
             event->accept();
             if (!isReadOnly())
                 clear();
@@ -1625,7 +1627,7 @@ void QAbstractSpinBoxPrivate::init()
     Q_Q(QAbstractSpinBox);
 
     q->setLineEdit(new QLineEdit(q));
-    edit->setObjectName(QLatin1String("qt_spinbox_lineedit"));
+    edit->setObjectName("qt_spinbox_lineedit"_L1);
     validator = new QSpinBoxValidator(q, this);
     edit->setValidator(validator);
 
@@ -1969,7 +1971,7 @@ QVariant QAbstractSpinBoxPrivate::calculateAdaptiveDecimalStep(int steps) const
 QSpinBoxValidator::QSpinBoxValidator(QAbstractSpinBox *qp, QAbstractSpinBoxPrivate *dp)
     : QValidator(qp), qptr(qp), dptr(dp)
 {
-    setObjectName(QLatin1String("qt_spinboxvalidator"));
+    setObjectName("qt_spinboxvalidator"_L1);
 }
 
 /*!
diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h
index bfde96372c..8aca45b98b 100644
--- a/src/widgets/widgets/qabstractspinbox_p.h
+++ b/src/widgets/widgets/qabstractspinbox_p.h
@@ -128,7 +128,7 @@ public:
     QVariant value, minimum, maximum, singleStep;
     QRect hoverRect;
 
-    mutable QString cachedText = QLatin1String("\x01");
+    mutable QString cachedText = { u'\x01' };
     mutable QVariant cachedValue;
     mutable QSize cachedSizeHint, cachedMinimumSizeHint;
     QLineEdit *edit = nullptr;
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 42fe33904b..86ce44520f 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -63,6 +63,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 enum {
     RowCount = 6,
     ColumnCount = 7,
@@ -105,9 +107,9 @@ protected:
 QString QCalendarDateSectionValidator::highlightString(const QString &str, int pos)
 {
     if (pos == 0)
-        return QLatin1String("<b>") + str + QLatin1String("</b>");
+        return "<b>"_L1 + str + "</b>"_L1;
     int startPos = str.length() - pos;
-    return QStringView{str}.mid(0, startPos) + QLatin1String("<b>") + QStringView{str}.mid(startPos, pos) + QLatin1String("</b>");
+    return QStringView{str}.mid(0, startPos) + "<b>"_L1 + QStringView{str}.mid(startPos, pos) + "</b>"_L1;
 
 }
 
@@ -1758,7 +1760,7 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget)
 {
     Q_Q(QCalendarWidget);
     navBarBackground = new QWidget(widget);
-    navBarBackground->setObjectName(QLatin1String("qt_calendar_navigationbar"));
+    navBarBackground->setObjectName("qt_calendar_navigationbar"_L1);
     navBarBackground->setAutoFillBackground(true);
     navBarBackground->setBackgroundRole(QPalette::Highlight);
 
@@ -1819,11 +1821,11 @@ void QCalendarWidgetPrivate::createNavigationBar(QWidget *widget)
     monthButton->setFocusPolicy(Qt::NoFocus);
 
     //set names for the header controls.
-    prevMonth->setObjectName(QLatin1String("qt_calendar_prevmonth"));
-    nextMonth->setObjectName(QLatin1String("qt_calendar_nextmonth"));
-    monthButton->setObjectName(QLatin1String("qt_calendar_monthbutton"));
-    yearButton->setObjectName(QLatin1String("qt_calendar_yearbutton"));
-    yearEdit->setObjectName(QLatin1String("qt_calendar_yearedit"));
+    prevMonth->setObjectName("qt_calendar_prevmonth"_L1);
+    nextMonth->setObjectName("qt_calendar_nextmonth"_L1);
+    monthButton->setObjectName("qt_calendar_monthbutton"_L1);
+    yearButton->setObjectName("qt_calendar_yearbutton"_L1);
+    yearEdit->setObjectName("qt_calendar_yearedit"_L1);
 
     updateMonthMenu();
     showMonth(m_model->m_date.year(m_model->m_calendar), m_model->m_date.month(m_model->m_calendar));
@@ -2135,7 +2137,7 @@ QCalendarWidget::QCalendarWidget(QWidget *parent)
     d->m_model->m_dayFormats.insert(Qt::Saturday, fmt);
     d->m_model->m_dayFormats.insert(Qt::Sunday, fmt);
     d->m_view = new QCalendarView(this);
-    d->m_view->setObjectName(QLatin1String("qt_calendar_calendarview"));
+    d->m_view->setObjectName("qt_calendar_calendarview"_L1);
     d->m_view->setModel(d->m_model);
     d->m_model->setView(d->m_view);
     d->m_view->setSelectionBehavior(QAbstractItemView::SelectItems);
@@ -2278,7 +2280,7 @@ QSize QCalendarWidget::minimumSizeHint() const
         headerW += monthW + buttonDecoMargin;
 
         fm = d->yearButton->fontMetrics();
-        headerW += fm.boundingRect(QLatin1String("5555")).width() + buttonDecoMargin;
+        headerW += fm.boundingRect("5555"_L1).width() + buttonDecoMargin;
 
         headerSize = QSize(headerW, headerH);
     }
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 9a097c4672..d381deae33 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -87,6 +87,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QComboBoxPrivate::QComboBoxPrivate()
     : QWidgetPrivate(),
       shownOnce(false),
@@ -158,8 +160,7 @@ QStyleOptionMenuItem QComboMenuDelegate::getStyleOption(const QStyleOptionViewIt
         menuOption.palette.setBrush(QPalette::All, QPalette::Window,
                                     qvariant_cast<QBrush>(index.data(Qt::BackgroundRole)));
     }
-    menuOption.text = index.model()->data(index, Qt::DisplayRole).toString()
-                           .replace(u'&', QLatin1String("&&"));
+    menuOption.text = index.model()->data(index, Qt::DisplayRole).toString().replace(u'&', "&&"_L1);
     menuOption.reservedShortcutWidth = 0;
     menuOption.maxIconWidth =  option.decorationSize.width() + 4;
     menuOption.menuRect = option.rect;
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index cc58eb165d..8c6080e3ae 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -69,6 +69,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // --- QDateTimeEdit ---
 
 /*!
@@ -2518,21 +2520,21 @@ void QDateTimeEditPrivate::init(const QVariant &var)
         updateTimeSpec();
         q->setDisplayFormat(defaultDateFormat);
         if (sectionNodes.isEmpty()) // ### safeguard for broken locale
-            q->setDisplayFormat(QLatin1String("dd/MM/yyyy"));
+            q->setDisplayFormat("dd/MM/yyyy"_L1);
         break;
     case QMetaType::QDateTime:
         value = var;
         updateTimeSpec();
         q->setDisplayFormat(defaultDateTimeFormat);
         if (sectionNodes.isEmpty()) // ### safeguard for broken locale
-            q->setDisplayFormat(QLatin1String("dd/MM/yyyy hh:mm:ss"));
+            q->setDisplayFormat("dd/MM/yyyy hh:mm:ss"_L1);
         break;
     case QMetaType::QTime:
         value = QDateTime(QDATETIMEEDIT_DATE_INITIAL, var.toTime());
         updateTimeSpec();
         q->setDisplayFormat(defaultTimeFormat);
         if (sectionNodes.isEmpty()) // ### safeguard for broken locale
-            q->setDisplayFormat(QLatin1String("hh:mm:ss"));
+            q->setDisplayFormat("hh:mm:ss"_L1);
         break;
     default:
         Q_ASSERT_X(0, "QDateTimeEditPrivate::init", "Internal error");
@@ -2636,7 +2638,7 @@ void QDateTimeEditPrivate::initCalendarPopup(QCalendarWidget *cw)
     Q_Q(QDateTimeEdit);
     if (!monthCalendar) {
         monthCalendar = new QCalendarPopup(q, cw, calendar);
-        monthCalendar->setObjectName(QLatin1String("qt_datetimedit_calendar"));
+        monthCalendar->setObjectName("qt_datetimedit_calendar"_L1);
         QObject::connect(monthCalendar, SIGNAL(newDateSelected(QDate)), q, SLOT(setDate(QDate)));
         QObject::connect(monthCalendar, SIGNAL(hidingCalendar(QDate)), q, SLOT(setDate(QDate)));
         QObject::connect(monthCalendar, SIGNAL(activated(QDate)), q, SLOT(setDate(QDate)));
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 66f92af051..c1aaa94771 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -61,6 +61,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 extern QString qt_setWindowTitle_helperHelper(const QString&, const QWidget*); // qwidget.cpp
 
 // qmainwindow.cpp
@@ -285,7 +287,7 @@ bool QDockWidgetLayout::wmSupportsNativeWindowDeco()
 #if defined(Q_OS_ANDROID)
     return false;
 #else
-    static const bool xcb = !QGuiApplication::platformName().compare(QLatin1String("xcb"), Qt::CaseInsensitive);
+    static const bool xcb = !QGuiApplication::platformName().compare("xcb"_L1, Qt::CaseInsensitive);
     return !xcb;
 #endif
 }
@@ -659,12 +661,12 @@ void QDockWidgetPrivate::init()
     layout->setSizeConstraint(QLayout::SetMinAndMaxSize);
 
     QAbstractButton *button = new QDockWidgetTitleButton(q);
-    button->setObjectName(QLatin1String("qt_dockwidget_floatbutton"));
+    button->setObjectName("qt_dockwidget_floatbutton"_L1);
     QObject::connect(button, SIGNAL(clicked()), q, SLOT(_q_toggleTopLevel()));
     layout->setWidgetForRole(QDockWidgetLayout::FloatButton, button);
 
     button = new QDockWidgetTitleButton(q);
-    button->setObjectName(QLatin1String("qt_dockwidget_closebutton"));
+    button->setObjectName("qt_dockwidget_closebutton"_L1);
     QObject::connect(button, SIGNAL(clicked()), q, SLOT(close()));
     layout->setWidgetForRole(QDockWidgetLayout::CloseButton, button);
 
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp
index 1becfafa6b..93fa77006b 100644
--- a/src/widgets/widgets/qfontcombobox.cpp
+++ b/src/widgets/widgets/qfontcombobox.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static QFontDatabase::WritingSystem writingSystemFromScript(QLocale::Script script)
 {
     switch (script) {
@@ -287,7 +289,7 @@ void QFontFamilyDelegate::paint(QPainter *painter,
 
     const QString sampleText = comboPrivate->sampleTextForFontFamily.value(text, comboPrivate->sampleTextForWritingSystem.value(system));
     if (system != QFontDatabase::Any || !sampleText.isEmpty()) {
-        int w = painter->fontMetrics().horizontalAdvance(text + QLatin1String("  "));
+        int w = painter->fontMetrics().horizontalAdvance(text + "  "_L1);
         painter->setFont(font2);
         const QString sample = !sampleText.isEmpty() ? sampleText : QFontDatabase::writingSystemSample(system);
         if (option.direction == Qt::RightToLeft)
@@ -350,7 +352,7 @@ void QFontComboBoxPrivate::_q_updateModel()
                 continue;
         }
         result += list.at(i);
-        if (list.at(i) == fi.family() || list.at(i).startsWith(fi.family() + QLatin1String(" [")))
+        if (list.at(i) == fi.family() || list.at(i).startsWith(fi.family() + " ["_L1))
             offset = result.count() - 1;
     }
     list = result;
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index 55cf8c0b41..9586151f0d 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -60,6 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QLabelPrivate::QLabelPrivate()
     : QFramePrivate(),
       sh(),
@@ -1555,11 +1557,11 @@ void QLabelPrivate::ensureTextPopulated() const
                 int from = 0;
                 bool found = false;
                 QTextCursor cursor;
-                while (!(cursor = control->document()->find((QLatin1String("&")), from)).isNull()) {
+                while (!(cursor = control->document()->find(("&"_L1), from)).isNull()) {
                     cursor.deleteChar(); // remove the ampersand
                     cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
                     from = cursor.position();
-                    if (!found && cursor.selectedText() != QLatin1String("&")) { //not a second &
+                    if (!found && cursor.selectedText() != "&"_L1) { //not a second &
                         found = true;
                         shortcutCursor = cursor;
                     }
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 7e1dea14f5..05a23ec101 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -97,6 +97,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     Initialize \a option with the values from this QLineEdit. This method
     is useful for subclasses when they need a QStyleOptionFrame, but don't want
@@ -2111,7 +2113,7 @@ void QLineEdit::paintEvent(QPaintEvent *)
 void QLineEdit::dragMoveEvent(QDragMoveEvent *e)
 {
     Q_D(QLineEdit);
-    if (!d->control->isReadOnly() && e->mimeData()->hasFormat(QLatin1String("text/plain"))) {
+    if (!d->control->isReadOnly() && e->mimeData()->hasFormat("text/plain"_L1)) {
         e->acceptProposedAction();
         d->control->moveCursor(d->xToPos(e->position().toPoint().x()), false);
         d->cursorVisible = true;
@@ -2215,7 +2217,7 @@ QMenu *QLineEdit::createStandardContextMenu()
 {
     Q_D(QLineEdit);
     QMenu *popup = new QMenu(this);
-    popup->setObjectName(QLatin1String("qt_edit_menu"));
+    popup->setObjectName("qt_edit_menu"_L1);
     QAction *action = nullptr;
 
     if (!isReadOnly()) {
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp
index 06a252bb95..d0e513bb8a 100644
--- a/src/widgets/widgets/qmainwindowlayout.cpp
+++ b/src/widgets/widgets/qmainwindowlayout.cpp
@@ -84,6 +84,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 extern QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *window);
 
 /******************************************************************************
@@ -100,14 +102,14 @@ static void dumpLayout(QTextStream &qout, const QDockAreaLayoutItem &item, QStri
             << "pos: " << item.pos << " size:" << item.size
             << " gap:" << (item.flags & QDockAreaLayoutItem::GapItem)
             << " keepSize:" << (item.flags & QDockAreaLayoutItem::KeepSize) << '\n';
-    indent += QLatin1String("  ");
+    indent += "  "_L1;
     if (item.widgetItem != nullptr) {
         qout << indent << "widget: "
             << item.widgetItem->widget()->metaObject()->className()
             << " \"" << item.widgetItem->widget()->windowTitle() << "\"\n";
     } else if (item.subinfo != nullptr) {
         qout << indent << "subinfo:\n";
-        dumpLayout(qout, *item.subinfo, indent + QLatin1String("  "));
+        dumpLayout(qout, *item.subinfo, indent + "  "_L1);
     } else if (item.placeHolderItem != nullptr) {
         QRect r = item.placeHolderItem->topLevelRect;
         qout << indent << "placeHolder: "
@@ -138,11 +140,11 @@ static void dumpLayout(QTextStream &qout, const QDockAreaLayoutInfo &layout, QSt
 #endif
             << '\n';
 
-    indent += QLatin1String("  ");
+    indent += "  "_L1;
 
     for (int i = 0; i < layout.item_list.count(); ++i) {
         qout << indent << "Item: " << i << '\n';
-        dumpLayout(qout, layout.item_list.at(i), indent + QLatin1String("  "));
+        dumpLayout(qout, layout.item_list.at(i), indent + "  "_L1);
     }
 }
 
@@ -155,13 +157,13 @@ static void dumpLayout(QTextStream &qout, const QDockAreaLayout &layout)
             << layout.rect.height() << '\n';
 
     qout << "TopDockArea:\n";
-    dumpLayout(qout, layout.docks[QInternal::TopDock], QLatin1String("  "));
+    dumpLayout(qout, layout.docks[QInternal::TopDock], "  "_L1);
     qout << "LeftDockArea:\n";
-    dumpLayout(qout, layout.docks[QInternal::LeftDock], QLatin1String("  "));
+    dumpLayout(qout, layout.docks[QInternal::LeftDock], "  "_L1);
     qout << "RightDockArea:\n";
-    dumpLayout(qout, layout.docks[QInternal::RightDock], QLatin1String("  "));
+    dumpLayout(qout, layout.docks[QInternal::RightDock], "  "_L1);
     qout << "BottomDockArea:\n";
-    dumpLayout(qout, layout.docks[QInternal::BottomDock], QLatin1String("  "));
+    dumpLayout(qout, layout.docks[QInternal::BottomDock], "  "_L1);
 }
 
 QDebug operator<<(QDebug debug, const QDockAreaLayout &layout)
@@ -1893,7 +1895,7 @@ QWidget *QMainWindowLayout::getSeparatorWidget()
         result = new QWidget(parentWidget());
         result->setAttribute(Qt::WA_MouseNoMask, true);
         result->setAutoFillBackground(false);
-        result->setObjectName(QLatin1String("qt_qmainwindow_extended_splitter"));
+        result->setObjectName("qt_qmainwindow_extended_splitter"_L1);
     }
     usedSeparatorWidgets.insert(result);
     return result;
@@ -2444,7 +2446,7 @@ QMainWindowLayout::QMainWindowLayout(QMainWindow *mainwindow, QLayout *parentLay
 #endif // QT_CONFIG(dockwidget)
     pluggingWidget = nullptr;
 
-    setObjectName(mainwindow->objectName() + QLatin1String("_layout"));
+    setObjectName(mainwindow->objectName() + "_layout"_L1);
 }
 
 QMainWindowLayout::~QMainWindowLayout()
@@ -2727,7 +2729,7 @@ void QMainWindowLayout::updateGapIndicator()
         if (!gapIndicator) {
             gapIndicator = new QRubberBand(QRubberBand::Rectangle, expectedParent);
             // For accessibility to identify this special widget.
-            gapIndicator->setObjectName(QLatin1String("qt_rubberband"));
+            gapIndicator->setObjectName("qt_rubberband"_L1);
         } else if (gapIndicator->parent() != expectedParent) {
             gapIndicator->setParent(expectedParent);
         }
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index 1167524a0a..51a9b54979 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -176,6 +176,7 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
 using namespace QMdi;
 
 // Asserts in debug mode, gives warning otherwise.
@@ -277,7 +278,7 @@ static inline QString tabTextFor(QMdiSubWindow *subWindow)
 
     QString title = subWindow->windowTitle();
     if (subWindow->isWindowModified()) {
-        title.replace(QLatin1String("[*]"), QLatin1String("*"));
+        title.replace("[*]"_L1, "*"_L1);
     } else {
         extern QString qt_setWindowTitle_helperHelper(const QString&, const QWidget*);
         title = qt_setWindowTitle_helperHelper(title, subWindow);
@@ -1515,7 +1516,7 @@ void QMdiAreaPrivate::highlightNextSubWindow(int increaseFactor)
     if (!rubberBand) {
         rubberBand = new QRubberBand(QRubberBand::Rectangle, q);
         // For accessibility to identify this special widget.
-        rubberBand->setObjectName(QLatin1String("qt_rubberband"));
+        rubberBand->setObjectName("qt_rubberband"_L1);
         rubberBand->setWindowFlags(rubberBand->windowFlags() | Qt::WindowStaysOnTopHint);
     }
 #endif
diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp
index 120bf590b9..8d0189a2ed 100644
--- a/src/widgets/widgets/qmdisubwindow.cpp
+++ b/src/widgets/widgets/qmdisubwindow.cpp
@@ -174,6 +174,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 using namespace QMdi;
 
 static const QStyle::SubControl SubControls[] =
@@ -286,7 +288,7 @@ QString QMdiSubWindowPrivate::originalWindowTitle()
     if (originalTitle.isNull()) {
         originalTitle = originalWindowTitleHelper();
         if (originalTitle.isNull())
-            originalTitle = QLatin1String("");
+            originalTitle = ""_L1;
     }
     return originalTitle;
 }
@@ -1919,7 +1921,7 @@ void QMdiSubWindowPrivate::enterRubberBandMode()
     if (!rubberBand) {
         rubberBand = new QRubberBand(QRubberBand::Rectangle, q->parentWidget());
         // For accessibility to identify this special widget.
-        rubberBand->setObjectName(QLatin1String("qt_rubberband"));
+        rubberBand->setObjectName("qt_rubberband"_L1);
     }
     QPoint rubberBandPos = q->mapToParent(QPoint(0, 0));
     rubberBand->setGeometry(rubberBandPos.x(), rubberBandPos.y(),
@@ -2216,7 +2218,7 @@ void QMdiSubWindowPrivate::updateInternalWindowTitle()
     Q_Q(QMdiSubWindow);
     if (q->isWindowModified()) {
         windowTitle = q->windowTitle();
-        windowTitle.replace(QLatin1String("[*]"), QLatin1String("*"));
+        windowTitle.replace("[*]"_L1, "*"_L1);
     } else {
         windowTitle = qt_setWindowTitle_helperHelper(q->windowTitle(), q);
     }
@@ -2334,10 +2336,8 @@ void QMdiSubWindow::setWidget(QWidget *widget)
         d->updateWindowTitle(true);
         isWindowModified = d->baseWidget->isWindowModified();
     }
-    if (!this->isWindowModified() && isWindowModified
-            && windowTitle().contains(QLatin1String("[*]"))) {
+    if (!this->isWindowModified() && isWindowModified && windowTitle().contains("[*]"_L1))
         setWindowModified(isWindowModified);
-    }
     d->lastChildWindowTitle = d->baseWidget->windowTitle();
     d->ignoreWindowTitleChange = false;
 
@@ -2770,7 +2770,7 @@ bool QMdiSubWindow::eventFilter(QObject *object, QEvent *event)
         bool windowModified = d->baseWidget->isWindowModified();
         if (!windowModified && d->baseWidget->windowTitle() != windowTitle())
             break;
-        if (windowTitle().contains(QLatin1String("[*]")))
+        if (windowTitle().contains("[*]"_L1))
             setWindowModified(windowModified);
         break;
     }
@@ -2871,7 +2871,7 @@ bool QMdiSubWindow::event(QEvent *event)
         d->updateInternalWindowTitle();
         break;
     case QEvent::ModifiedChange:
-        if (!windowTitle().contains(QLatin1String("[*]")))
+        if (!windowTitle().contains("[*]"_L1))
             break;
 #if QT_CONFIG(menubar)
         if (maximizedButtonsWidget() && d->controlContainer->menuBar() && d->controlContainer->menuBar()
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index c9df8c50eb..4c66267b7d 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -71,6 +71,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QMenuBarExtension : public QToolButton
 {
 public:
@@ -83,7 +85,7 @@ public:
 QMenuBarExtension::QMenuBarExtension(QWidget *parent)
     : QToolButton(parent)
 {
-    setObjectName(QLatin1String("qt_menubar_ext_button"));
+    setObjectName("qt_menubar_ext_button"_L1);
     setAutoRaise(true);
 #if QT_CONFIG(menu)
     setPopupMode(QToolButton::InstantPopup);
diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp
index 89c0990002..4440909c26 100644
--- a/src/widgets/widgets/qprogressbar.cpp
+++ b/src/widgets/widgets/qprogressbar.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QProgressBarPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QProgressBar)
@@ -89,7 +91,7 @@ QProgressBarPrivate::QProgressBarPrivate()
 void QProgressBarPrivate::initDefaultFormat()
 {
     if (defaultFormat)
-        format = QLatin1String("%p") + locale.percent();
+        format = "%p"_L1 + locale.percent();
 }
 
 void QProgressBarPrivate::init()
@@ -152,10 +154,9 @@ bool QProgressBarPrivate::repaintRequired() const
 
     const auto totalSteps = qint64(maximum) - minimum;
     if (textVisible) {
-        if ((format.contains(QLatin1String("%v"))))
+        if (format.contains("%v"_L1))
             return true;
-        if ((format.contains(QLatin1String("%p"))
-             && valueDifference >= qAbs(totalSteps / 100)))
+        if (format.contains("%p"_L1) && valueDifference >= qAbs(totalSteps / 100))
             return true;
     }
 
@@ -468,19 +469,19 @@ QString QProgressBar::text() const
     QString result = d->format;
     QLocale locale = d->locale; // Omit group separators for compatibility with previous versions that were non-localized.
     locale.setNumberOptions(locale.numberOptions() | QLocale::OmitGroupSeparator);
-    result.replace(QLatin1String("%m"), locale.toString(totalSteps));
-    result.replace(QLatin1String("%v"), locale.toString(d->value));
+    result.replace("%m"_L1, locale.toString(totalSteps));
+    result.replace("%v"_L1, locale.toString(d->value));
 
     // If max and min are equal and we get this far, it means that the
     // progress bar has one step and that we are on that step. Return
     // 100% here in order to avoid division by zero further down.
     if (totalSteps == 0) {
-        result.replace(QLatin1String("%p"), locale.toString(100));
+        result.replace("%p"_L1, locale.toString(100));
         return result;
     }
 
     const auto progress = static_cast<int>((qint64(d->value) - d->minimum) * 100.0 / totalSteps);
-    result.replace(QLatin1String("%p"), locale.toString(progress));
+    result.replace("%p"_L1, locale.toString(progress));
     return result;
 }
 
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index a5ce8f658a..b6308eda76 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 //#define QSPINBOX_QSBDEBUG
 #ifdef QSPINBOX_QSBDEBUG
 #  define QSBDEBUG qDebug
@@ -518,7 +520,7 @@ QString QSpinBox::textFromValue(int value) const
     QString str;
 
     if (d->displayIntegerBase != 10) {
-        const QLatin1String prefix = value < 0 ? QLatin1String("-") : QLatin1String();
+        const auto prefix = value < 0 ? "-"_L1 : ""_L1;
         str = prefix + QString::number(qAbs(value), d->displayIntegerBase);
     } else {
         str = locale().toString(value);
@@ -1126,8 +1128,8 @@ QVariant QSpinBoxPrivate::validateAndInterpret(QString &input, int &pos,
     int num = min;
 
     if (max != min && (copy.isEmpty()
-                       || (min < 0 && copy == QLatin1String("-"))
-                       || (max >= 0 && copy == QLatin1String("+")))) {
+                       || (min < 0 && copy == "-"_L1)
+                       || (max >= 0 && copy == "+"_L1))) {
         state = QValidator::Intermediate;
         QSBDEBUG() << __FILE__ << __LINE__<< "num is set to" << num;
     } else if (copy.startsWith(u'-') && min >= 0) {
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 5ff1cc5c9f..174c5b4df9 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -62,6 +62,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 //#define QSPLITTER_DEBUG
 
 QSplitterPrivate::~QSplitterPrivate()
@@ -873,7 +875,7 @@ QSplitterLayoutStruct *QSplitterPrivate::insertWidget(int index, QWidget *w)
     } else {
         sls = new QSplitterLayoutStruct;
         QSplitterHandle *newHandle = q->createHandle();
-        newHandle->setObjectName(QLatin1String("qt_splithandle_") + w->objectName());
+        newHandle->setObjectName("qt_splithandle_"_L1 + w->objectName());
         sls->handle = newHandle;
         sls->widget = w;
         w->lower();
@@ -1340,7 +1342,7 @@ void QSplitter::setRubberBand(int pos)
         QBoolBlocker b(d->blockChildAdd);
         d->rubberBand = new QRubberBand(QRubberBand::Line, this);
         // For accessibility to identify this special widget.
-        d->rubberBand->setObjectName(QLatin1String("qt_rubberband"));
+        d->rubberBand->setObjectName("qt_rubberband"_L1);
     }
 
     const QRect newGeom = d->orient == Qt::Horizontal ? QRect(QPoint(pos + hw / 2 - rBord, r.y()), QSize(2 * rBord, r.height()))
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index ac5d3c142a..74e036f65d 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -1550,7 +1550,7 @@ static QString computeElidedText(Qt::TextElideMode mode, const QString &text)
     if (text.length() <= 3)
         return text;
 
-    static const QLatin1String Ellipses("...");
+    static const auto Ellipses = "..."_L1;
     QString ret;
     switch (mode) {
     case Qt::ElideRight:
diff --git a/src/widgets/widgets/qtabwidget.cpp b/src/widgets/widgets/qtabwidget.cpp
index 14059ae70f..1a63319c2b 100644
--- a/src/widgets/widgets/qtabwidget.cpp
+++ b/src/widgets/widgets/qtabwidget.cpp
@@ -55,6 +55,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QTabWidget
     \brief The QTabWidget class provides a stack of tabbed widgets.
@@ -226,14 +228,14 @@ void QTabWidgetPrivate::init()
     Q_Q(QTabWidget);
 
     stack = new QStackedWidget(q);
-    stack->setObjectName(QLatin1String("qt_tabwidget_stackedwidget"));
+    stack->setObjectName("qt_tabwidget_stackedwidget"_L1);
     stack->setLineWidth(0);
     // hack so that QMacStyle::layoutSpacing() can detect tab widget pages
     stack->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, QSizePolicy::TabWidget));
 
     QObject::connect(stack, SIGNAL(widgetRemoved(int)), q, SLOT(_q_removeTab(int)));
     QTabBar *tabBar = new QTabBar(q);
-    tabBar->setObjectName(QLatin1String("qt_tabwidget_tabbar"));
+    tabBar->setObjectName("qt_tabwidget_tabbar"_L1);
     tabBar->setDrawBase(false);
     q->setTabBar(tabBar);
 
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index b070598f81..c48f4cfa39 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -58,6 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 static inline bool shouldEnableInputMethod(QTextBrowser *texbrowser)
 {
 #if defined (Q_OS_ANDROID)
@@ -169,14 +171,14 @@ Q_DECLARE_TYPEINFO(QTextBrowserPrivate::HistoryEntry, Q_RELOCATABLE_TYPE);
 QString QTextBrowserPrivate::findFile(const QUrl &name) const
 {
     QString fileName;
-    if (name.scheme() == QLatin1String("qrc")) {
-        fileName = QLatin1String(":/") + name.path();
+    if (name.scheme() == "qrc"_L1) {
+        fileName = ":/"_L1 + name.path();
     } else if (name.scheme().isEmpty()) {
         fileName = name.path();
     } else {
 #if defined(Q_OS_ANDROID)
-        if (name.scheme() == QLatin1String("assets"))
-            fileName = QLatin1String("assets:") + name.path();
+        if (name.scheme() == "assets"_L1)
+            fileName = "assets:"_L1 + name.path();
         else
 #endif
             fileName = name.toLocalFile();
@@ -207,7 +209,7 @@ QUrl QTextBrowserPrivate::resolveUrl(const QUrl &url) const
     // For the second case QUrl can merge "#someanchor" with "foo.html"
     // correctly to "foo.html#someanchor"
     if (!(currentURL.isRelative()
-          || (currentURL.scheme() == QLatin1String("file")
+          || (currentURL.scheme() == "file"_L1
               && !QFileInfo(currentURL.toLocalFile()).isAbsolute()))
           || (url.hasFragment() && url.path().isEmpty())) {
         return currentURL.resolved(url);
@@ -245,11 +247,11 @@ void QTextBrowserPrivate::_q_activateAnchor(const QString &href)
 
 #ifndef QT_NO_DESKTOPSERVICES
     bool isFileScheme =
-            url.scheme() == QLatin1String("file")
+            url.scheme() == "file"_L1
 #if defined(Q_OS_ANDROID)
-            || url.scheme() == QLatin1String("assets")
+            || url.scheme() == "assets"_L1
 #endif
-            || url.scheme() == QLatin1String("qrc");
+            || url.scheme() == "qrc"_L1;
     if ((openExternalLinks && !isFileScheme && !url.isRelative())
         || (url.isRelative() && !currentURL.isRelative() && !isFileScheme)) {
         QDesktopServices::openUrl(url);
@@ -304,9 +306,9 @@ void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType
     QString fileName = url.fileName();
     if (type == QTextDocument::UnknownResource) {
 #if QT_CONFIG(textmarkdownreader)
-        if (fileName.endsWith(QLatin1String(".md")) ||
-                fileName.endsWith(QLatin1String(".mkd")) ||
-                fileName.endsWith(QLatin1String(".markdown")))
+        if (fileName.endsWith(".md"_L1) ||
+                fileName.endsWith(".mkd"_L1) ||
+                fileName.endsWith(".markdown"_L1))
             type = QTextDocument::MarkdownResource;
         else
 #endif
@@ -337,7 +339,7 @@ void QTextBrowserPrivate::setSource(const QUrl &url, QTextDocument::ResourceType
 
         if (q->isVisible()) {
             const QStringView firstTag = QStringView{txt}.left(txt.indexOf(u'>') + 1);
-            if (firstTag.startsWith(QLatin1String("<qt")) && firstTag.contains(QLatin1String("type")) && firstTag.contains(QLatin1String("detail"))) {
+            if (firstTag.startsWith("<qt"_L1) && firstTag.contains("type"_L1) && firstTag.contains("detail"_L1)) {
 #ifndef QT_NO_CURSOR
                 QGuiApplication::restoreOverrideCursor();
 #endif
diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp
index 76bc5a4773..a17d375d15 100644
--- a/src/widgets/widgets/qtoolbarextension.cpp
+++ b/src/widgets/widgets/qtoolbarextension.cpp
@@ -45,11 +45,13 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 QToolBarExtension::QToolBarExtension(QWidget *parent)
     : QToolButton(parent)
     , m_orientation(Qt::Horizontal)
 {
-    setObjectName(QLatin1String("qt_toolbar_ext_button"));
+    setObjectName("qt_toolbar_ext_button"_L1);
     setAutoRaise(true);
     setOrientation(m_orientation);
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp
index 787554551d..5afda0a871 100644
--- a/src/widgets/widgets/qtoolbox.cpp
+++ b/src/widgets/widgets/qtoolbox.cpp
@@ -56,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QToolBoxButton : public QAbstractButton
 {
     Q_OBJECT
@@ -351,7 +353,7 @@ int QToolBox::insertItem(int index, QWidget *widget, const QIcon &icon, const QS
     auto &c = *newPage;
     c.widget = widget;
     c.button = new QToolBoxButton(this);
-    c.button->setObjectName(QLatin1String("qt_toolbox_toolboxbutton"));
+    c.button->setObjectName("qt_toolbox_toolboxbutton"_L1);
     connect(c.button, SIGNAL(clicked()), this, SLOT(_q_buttonClicked()));
 
     c.sv = new QScrollArea(this);
diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 9f47b876c0..bb4b4acc7f 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -67,6 +67,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 class QToolButtonPrivate : public QAbstractButtonPrivate
 {
     Q_DECLARE_PUBLIC(QToolButton)
@@ -939,7 +941,7 @@ void QToolButton::setDefaultAction(QAction *action)
     // If iconText() is generated from text(), we need to escape any '&'s so they
     // don't turn into shortcuts
     if (QActionPrivate::get(action)->iconText.isEmpty())
-        buttonText.replace(QLatin1String("&"), QLatin1String("&&"));
+        buttonText.replace("&"_L1, "&&"_L1);
     setText(buttonText);
     setIcon(action->icon());
 #if QT_CONFIG(tooltip)
diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp
index 0cf9457a57..c2933d292e 100644
--- a/src/widgets/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/widgets/qwidgetresizehandler.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 #define RANGE 4
 
 static bool resizeHorizontalDirectionFixed = false;
@@ -219,7 +221,7 @@ void QWidgetResizeHandler::mouseMoveEvent(QMouseEvent *e)
     QPoint pp = globalPos - moveOffset;
 
     // Workaround for window managers which refuse to move a tool window partially offscreen.
-    if (QGuiApplication::platformName() == QLatin1String("xcb")) {
+    if (QGuiApplication::platformName() == "xcb"_L1) {
         const QRect desktop = QWidgetPrivate::availableScreenGeometry(widget);
         pp.rx() = qMax(pp.x(), desktop.left());
         pp.ry() = qMax(pp.y(), desktop.top());
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
index bc7da638c9..3d41f2a9fb 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
@@ -110,6 +110,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // could go into QTextCursor...
 static QTextLine currentTextLine(const QTextCursor &cursor)
 {
@@ -2709,8 +2711,8 @@ bool QWidgetTextControl::canInsertFromMimeData(const QMimeData *source) const
     if (d->acceptRichText)
         return (source->hasText() && !source->text().isEmpty())
             || source->hasHtml()
-            || source->hasFormat(QLatin1String("application/x-qrichtext"))
-            || source->hasFormat(QLatin1String("application/x-qt-richtext"));
+            || source->hasFormat("application/x-qrichtext"_L1)
+            || source->hasFormat("application/x-qt-richtext"_L1);
     else
         return source->hasText() && !source->text().isEmpty();
 }
@@ -2724,10 +2726,10 @@ void QWidgetTextControl::insertFromMimeData(const QMimeData *source)
     bool hasData = false;
     QTextDocumentFragment fragment;
 #ifndef QT_NO_TEXTHTMLPARSER
-    if (source->hasFormat(QLatin1String("application/x-qrichtext")) && d->acceptRichText) {
+    if (source->hasFormat("application/x-qrichtext"_L1) && d->acceptRichText) {
         // x-qrichtext is always UTF-8 (taken from Qt3 since we don't use it anymore).
-        const QString richtext = QLatin1String("<meta name=\"qrichtext\" content=\"1\" />")
-                + QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext")));
+        const QString richtext = "<meta name=\"qrichtext\" content=\"1\" />"_L1
+                + QString::fromUtf8(source->data("application/x-qrichtext"_L1));
         fragment = QTextDocumentFragment::fromHtml(richtext, d->doc);
         hasData = true;
     } else if (source->hasHtml() && d->acceptRichText) {
@@ -3479,7 +3481,7 @@ void QTextEditMimeData::setup() const
 {
     QTextEditMimeData *that = const_cast<QTextEditMimeData *>(this);
 #ifndef QT_NO_TEXTHTMLPARSER
-    that->setData(QLatin1String("text/html"), fragment.toHtml().toUtf8());
+    that->setData("text/html"_L1, fragment.toHtml().toUtf8());
 #endif
 #ifndef QT_NO_TEXTODFWRITER
     {
@@ -3487,7 +3489,7 @@ void QTextEditMimeData::setup() const
         QTextDocumentWriter writer(&buffer, "ODF");
         writer.write(fragment);
         buffer.close();
-        that->setData(QLatin1String("application/vnd.oasis.opendocument.text"), buffer.data());
+        that->setData("application/vnd.oasis.opendocument.text"_L1, buffer.data());
     }
 #endif
     that->setText(fragment.toRawText());