4 files changed, 20 insertions, 12 deletions

diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
index 232599c561d..9e4a7d4041e 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 // To ensure that all variables inside the simplex solver are non-negative,
 // we limit the size of anchors in the interval [-limit, limit]. Then before
 // sending them to the simplex solver we add "limit" as an offset, so that
@@ -609,7 +611,7 @@ QSimplexConstraint *GraphPath::constraint(const GraphPath &path) const
 #ifdef QT_DEBUG
 QString GraphPath::toString() const
 {
-    QString string(QLatin1String("Path: "));
+    QString string("Path: "_L1);
     for (AnchorData *edge : positives)
         string += QString::fromLatin1(" (+++) %1").arg(edge->toString());
 
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
index 9fa14a3f906..f6373aad126 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
@@ -269,42 +269,44 @@ struct AnchorVertexPair : public AnchorVertex {
 #ifdef QT_DEBUG
 inline QString AnchorVertex::toString() const
 {
+    using namespace Qt::StringLiterals;
+
     if (!m_item)
         return QString::fromLatin1("NULL_%1").arg(quintptr(this));
 
     QString edge;
     switch (m_edge) {
     case Qt::AnchorLeft:
-        edge = QLatin1String("Left");
+        edge = "Left"_L1;
         break;
     case Qt::AnchorHorizontalCenter:
-        edge = QLatin1String("HorizontalCenter");
+        edge = "HorizontalCenter"_L1;
         break;
     case Qt::AnchorRight:
-        edge = QLatin1String("Right");
+        edge = "Right"_L1;
         break;
     case Qt::AnchorTop:
-        edge = QLatin1String("Top");
+        edge = "Top"_L1;
         break;
     case Qt::AnchorVerticalCenter:
-        edge = QLatin1String("VerticalCenter");
+        edge = "VerticalCenter"_L1;
         break;
     case Qt::AnchorBottom:
-        edge = QLatin1String("Bottom");
+        edge = "Bottom"_L1;
         break;
     default:
-        edge = QLatin1String("None");
+        edge = "None"_L1;
         break;
     }
     QString itemName;
     if (m_item->isLayout()) {
-        itemName = QLatin1String("layout");
+        itemName = "layout"_L1;
     } else {
         if (QGraphicsItem *item = m_item->graphicsItem()) {
             itemName = item->data(0).toString();
         }
     }
-    edge.insert(0, QLatin1String("%1_"));
+    edge.insert(0, "%1_"_L1);
     return edge.arg(itemName);
 }
 #endif
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index c857d5dc5a0..e7b41fed50f 100644
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -67,6 +67,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
     \class QGraphicsWidget
     \brief The QGraphicsWidget class is the base class for all widget
@@ -2401,7 +2403,7 @@ void QGraphicsWidget::dumpFocusChain()
             qWarning("Found a focus chain that is not circular, (next == 0)");
             break;
         }
-        qDebug() << i++ << QString::number(uint(next), 16) << next->className() << next->data(0) << QString::fromLatin1("focusItem:%1").arg(next->hasFocus() ? '1' : '0') << QLatin1String("next:") << next->d_func()->focusNext->data(0) << QLatin1String("prev:") << next->d_func()->focusPrev->data(0);
+        qDebug() << i++ << QString::number(uint(next), 16) << next->className() << next->data(0) << QString::fromLatin1("focusItem:%1").arg(next->hasFocus() ? '1' : '0') << "next:"_L1 << next->d_func()->focusNext->data(0) << "prev:"_L1 << next->d_func()->focusPrev->data(0);
         if (visited.contains(next)) {
             qWarning("Already visited this node. However, I expected to dump until I found myself.");
             break;
diff --git a/src/widgets/graphicsview/qsimplex_p.cpp b/src/widgets/graphicsview/qsimplex_p.cpp
index b9f7275d00b..b2a2fad697f 100644
--- a/src/widgets/graphicsview/qsimplex_p.cpp
+++ b/src/widgets/graphicsview/qsimplex_p.cpp
@@ -46,6 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
+using namespace Qt::StringLiterals;
+
 /*!
   \internal
   \class QSimplex
@@ -354,7 +356,7 @@ void QSimplex::dumpMatrix()
 {
     qDebug("---- Simplex Matrix ----\n");
 
-    QString str(QLatin1String("       "));
+    QString str("       "_L1);
     for (int j = 0; j < columns; ++j)
         str += QString::fromLatin1("  <%1 >").arg(j, 2);
     qDebug("%s", qPrintable(str));