Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

3 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/doc/snippets/code/doc_src_coordsys.cpp b/src/gui/doc/snippets/code/doc_src_coordsys.cpp
index 7c53d9e731..147c146b44 100644
--- a/src/gui/doc/snippets/code/doc_src_coordsys.cpp
+++ b/src/gui/doc/snippets/code/doc_src_coordsys.cpp
@@ -52,6 +52,7 @@
 QPainter painter(this);
 
 painter.setPen(Qt::darkGreen);
+// Using the (x  y  w  h) overload
 painter.drawRect(1, 2, 6, 4);
 //! [0]
 
@@ -69,6 +70,7 @@ QPainter painter(this);
 painter.setRenderHint(
     QPainter::Antialiasing);
 painter.setPen(Qt::darkGreen);
+// Using the (x  y  w  h) overload
 painter.drawRect(1, 2, 6, 4);
 //! [2]
 
diff --git a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
index bf864ce48d..236d6952e6 100644
--- a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
+++ b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
@@ -114,7 +114,7 @@ void MainWindow::insertCalendar()
     int year = date.year(), month = date.month();
 
     for (int weekDay = 1; weekDay <= 7; ++weekDay) {
-        cursor.insertText(QString("%1 ").arg(QDate::shortDayName(weekDay), 3),
+        cursor.insertText(QString("%1 ").arg(QLocale::system().dayName(weekDay), 3),
             boldFormat);
     }
 
diff --git a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
index a5801da67e..849f0e957f 100644
--- a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
@@ -117,7 +117,7 @@ void MainWindow::insertCalendar()
     int year = date.year(), month = date.month();
 
     for (int weekDay = 1; weekDay <= 7; ++weekDay) {
-        cursor.insertText(QString("%1 ").arg(QDate::shortDayName(weekDay), 3),
+        cursor.insertText(QString("%1 ").arg(QLocale::system().dayName(weekDay), 3),
             boldFormat);
     }