Doc: remove "2" from Qt Quick Controls files

Work on this was already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.

The CMake target (docs_QuickControls2) probably can't be renamed
until we rename the library, which won't happen until Qt 7.

Task-number: QTBUG-95413
Change-Id: Ied20805a91286436606577c3de39671a447f27dd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

30 files changed, 30 insertions, 30 deletions

diff --git a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
index 3320012cb4..e75da2d2ef 100644
--- a/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter1/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter1")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter1")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
diff --git a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
index 6b50809f20..c44cd50659 100644
--- a/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
+++ b/examples/quickcontrols/chattutorial/chapter1/chapter1.pro
@@ -10,5 +10,5 @@ resources.prefix = chapter1/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter1
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter1
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
index c011336802..4bf3e834cd 100644
--- a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter2")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter2")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
diff --git a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
index 15429b7c89..00cf68b57c 100644
--- a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
+++ b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
@@ -23,5 +23,5 @@ resources.prefix = chapter2/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter2
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter2
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
index 92545ec1d0..d46fd3455d 100644
--- a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter3")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter3")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
 
diff --git a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
index 42adc69fe9..9a4c5b5703 100644
--- a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
+++ b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
@@ -25,5 +25,5 @@ resources.prefix = chapter3/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter3
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter3
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
index 024430a495..cf6985cfe8 100644
--- a/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter4/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter4")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter4")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Sql)
 
diff --git a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
index ae8141f7f1..baf2d319d5 100644
--- a/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
+++ b/examples/quickcontrols/chattutorial/chapter4/chapter4.pro
@@ -30,5 +30,5 @@ resources.prefix = chapter4/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter4
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter4
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
index 657684fc34..0e72bc31f1 100644
--- a/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
+++ b/examples/quickcontrols/chattutorial/chapter5/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter5")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols/chattutorial/chapter5")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick Sql)
 
diff --git a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
index 625642d7b5..3ba8d97ddc 100644
--- a/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
+++ b/examples/quickcontrols/chattutorial/chapter5/chapter5.pro
@@ -32,5 +32,5 @@ resources.prefix = chapter5/
 RESOURCES += resources \
     qtquickcontrols2.conf
 
-target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter5
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols/chattutorial/chapter5
 INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png
index aa3c4bb5be..aa3c4bb5be 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter1.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter1.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif
index 17096519b0..17096519b0 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2-listview-header.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2-listview-header.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png
index af25cff94e..af25cff94e 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter2.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter2.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif
index 07eb93b191..07eb93b191 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-listview-header.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-listview-header.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png
index 1c8ffbf46e..1c8ffbf46e 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3-view-margins.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3-view-margins.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif
index 1763b1f3a5..1763b1f3a5 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter3.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter3.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png
index b2f4c2adf8..b2f4c2adf8 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-long-message.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-long-message.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png
index ea75b1dce5..ea75b1dce5 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4-message-timestamp.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif
index dd47c4cbf8..dd47c4cbf8 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter4.gif
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter4.gif
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
index 8b8f05faa1..8b8f05faa1 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
index 29e149df9f..29e149df9f 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png
index 23d744e7be..23d744e7be 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-material.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-material.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
index 2aef535c39..2aef535c39 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png
index c18a341b42..c18a341b42 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-contacts-universal.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
index f15c7d7d76..f15c7d7d76 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
index b33fc74ea6..b33fc74ea6 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png
index 31833164d8..31833164d8 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-material.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-material.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
index b4bd7e9f4f..b4bd7e9f4f 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
diff --git a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png
index 09ed5ceb94..09ed5ceb94 100644
--- a/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
+++ b/examples/quickcontrols/chattutorial/doc/images/qtquickcontrols-chattutorial-chapter5-conversations-universal.png
diff --git a/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols-chattutorial.qdoc
index 52228b900d..c34c20d508 100644
--- a/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols/chattutorial/doc/src/qtquickcontrols-chattutorial.qdoc
@@ -7,7 +7,7 @@
 \title Qt Quick Controls - Chat Tutorial
 \keyword Qt Quick Controls 2 - Chat Tutorial
 \brief Tutorial about writing a basic chat client using Qt Quick Controls.
-\ingroup qtquickcontrols2-examples
+\ingroup qtquickcontrols-examples
 
 This tutorial shows how to write a basic chat application using Qt Quick
 Controls. It will also explain how to integrate an SQL database into a Qt
@@ -193,7 +193,7 @@ It determines where the example is copied, on running "\c{make install}".
 
 Now we can build and run the application:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter1.png
+\borderedimage qtquickcontrols-chattutorial-chapter1.png
 
 \noautolist
 \generatelist examplefiles .*chapter1.*
@@ -270,7 +270,7 @@ The image will be \c 40 pixels wide and \c 40 pixels high. We'll base the
 height of the delegate on the image's height, so that we don't have any empty
 vertical space.
 
-\borderedimage qtquickcontrols2-chattutorial-chapter2.png
+\borderedimage qtquickcontrols-chattutorial-chapter2.png
 
 \generatelist examplefiles .*(chapter2|shared).*
 \generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png
@@ -324,7 +324,7 @@ In chapter 2, we added a ListView below the header. If you run the application
 for that chapter, you'll see that the contents of the view can be scrolled over
 the top of the header:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter2-listview-header.gif
+\borderedimage qtquickcontrols-chattutorial-chapter2-listview-header.gif
 
 This is not that nice, especially if the text in the
 delegates is long enough that it reaches the text in the header. What we
@@ -344,7 +344,7 @@ usual, comes from the application style. Here it is in action:
 \printuntil }
 \printuntil }
 
-\borderedimage qtquickcontrols2-chattutorial-chapter3-listview-header.gif
+\borderedimage qtquickcontrols-chattutorial-chapter3-listview-header.gif
 
 It has no layout of its own, so we center the label within it ourselves.
 
@@ -445,7 +445,7 @@ After filling the width and height of its parent, we also set some margins on
 the view. This gives us a nice alignment with the placeholder text in the
 "compose message" field:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter3-view-margins.png
+\borderedimage qtquickcontrols-chattutorial-chapter3-view-margins.png
 
 Next, we set \l {ListView::}{displayMarginBeginning} and \l
 {ListView::}{displayMarginEnd}. These properties ensure that the delegates
@@ -497,7 +497,7 @@ does not go outside of the screen.
 
 Finally, the button is only enabled when there is actually a message to send.
 
-\borderedimage qtquickcontrols2-chattutorial-chapter3.gif
+\borderedimage qtquickcontrols-chattutorial-chapter3.gif
 
 \generatelist examplefiles .*(chapter3|shared).*
 \generatelist exampleimages .*shared.*(Einstein|Hemingway|Gude)\.png
@@ -678,7 +678,7 @@ timestamp that we want to display below every message:
 \printuntil }
 \printuntil }
 
-\borderedimage qtquickcontrols2-chattutorial-chapter4-message-timestamp.png
+\borderedimage qtquickcontrols-chattutorial-chapter4-message-timestamp.png
 
 Now that we have a proper model, we can use its \c recipient role in the
 expression for the \c sentByMe property.
@@ -700,7 +700,7 @@ smaller value. However, in the image below, the message text is quite long, so
 the smaller value (the width of the view) is chosen, ensuring that the text
 stops at the opposite edge of the screen:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter4-long-message.png
+\borderedimage qtquickcontrols-chattutorial-chapter4-long-message.png
 
 In order to display the timestamp for each message that we discussed earlier,
 we use a Label. The date and time are formatted with
@@ -716,7 +716,7 @@ First, we call the invokable \c sendMessage() function of the model, which
 inserts a new row into the Conversations database table. Then, we clear the
 text field to make way for future input.
 
-\borderedimage qtquickcontrols2-chattutorial-chapter4.gif
+\borderedimage qtquickcontrols-chattutorial-chapter4.gif
 
 \generatelist examplefiles .*(chapter4|shared).*
 \generatelist exampleimages
@@ -732,12 +732,12 @@ So far, we've just been testing the application with the Basic style. If we
 run it with the \l {Material Style}, for example, we'll immediately see some issues.
 Here is the Contacts page:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material-test.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material-test.png
 
 The header text is black on a dark blue background, which is very difficult to
 read. The same thing occurs with the Conversations page:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material-test.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material-test.png
 
 The solution is to tell the toolbar that it should use the \e "Dark" theme, so
 that this information is propagated to its children, allowing them to switch
@@ -808,13 +808,13 @@ We'll make the same changes to \c ConversationPage.qml:
 
 Now both pages look correct:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material.png
 
 Let's try out the Universal style:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-universal.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-universal.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-universal.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-universal.png
 
 No issues there. For a relatively simple application such as this one, there
 should be very few adjustments necessary when switching styles.
@@ -833,8 +833,8 @@ Theme=Dark
 
 Once this is done, build and run the application. This is what you should see:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-material-dark.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-material-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-material-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-material-dark.png
 
 Both pages look fine. Now add an entry for the Universal style:
 
@@ -845,8 +845,8 @@ Theme=Dark
 
 After building and running the application, you should see these results:
 
-\borderedimage qtquickcontrols2-chattutorial-chapter5-contacts-universal-dark.png
-\borderedimage qtquickcontrols2-chattutorial-chapter5-conversations-universal-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-contacts-universal-dark.png
+\borderedimage qtquickcontrols-chattutorial-chapter5-conversations-universal-dark.png
 
 \generatelist examplefiles .*(chapter5|shared).*
 \generatelist exampleimages