Remove "2" from Qt Quick Controls directories

Qt Quick Controls 2 was named that way because it was a follow-up to
Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer
supported, we don't need to have "2" in the name. Work on this was
already started for the documentation in
1abdfe5d5a052f2298b7bf657513dfa7e0c66a56.

By doing this renaming a few weeks before feature freeze, it won't
affect the release but still results in as little time possible spent
manually fixing conflicts in cherry-picks from non-LTS releases as a
result of the renaming.

This patch does the following:

- Renames directories.
- Adapts CMakeLists.txt and other files to account for the new paths.

A follow-up patch will handle documentation.

It does not touch library names or other user-facing stuff, as that
will have to be done in Qt 7.

Task-number: QTBUG-95413
Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

20 files changed, 281 insertions, 0 deletions

diff --git a/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
new file mode 100644
index 0000000000..92545ec1d0
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/CMakeLists.txt
@@ -0,0 +1,62 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+cmake_minimum_required(VERSION 3.16)
+project(chapter3 LANGUAGES CXX)
+
+set(CMAKE_AUTOMOC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+    set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter3")
+
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
+
+qt_add_executable(chattutorial-chapter3 WIN32 MACOSX_BUNDLE
+    main.cpp
+)
+
+target_link_libraries(chattutorial-chapter3 PRIVATE
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+# Resources:
+qt_add_qml_module(chattutorial-chapter3
+    URI chapter3
+    VERSION 1.0
+    QML_FILES
+        "ContactPage.qml"
+        "ConversationPage.qml"
+        "main.qml"
+    RESOURCES
+        "images/Albert_Einstein.png"
+        "images/Albert_Einstein@2x.png"
+        "images/Albert_Einstein@3x.png"
+        "images/Albert_Einstein@4x.png"
+        "images/Ernest_Hemingway.png"
+        "images/Ernest_Hemingway@2x.png"
+        "images/Ernest_Hemingway@3x.png"
+        "images/Ernest_Hemingway@4x.png"
+        "images/Hans_Gude.png"
+        "images/Hans_Gude@2x.png"
+        "images/Hans_Gude@3x.png"
+        "images/Hans_Gude@4x.png"
+)
+
+qt6_add_resources(chattutorial-chapter3 "conf"
+    PREFIX
+        "/"
+    FILES
+        "qtquickcontrols2.conf"
+)
+
+install(TARGETS chattutorial-chapter3
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/quickcontrols/chattutorial/chapter3/ContactPage.qml b/examples/quickcontrols/chattutorial/chapter3/ContactPage.qml
new file mode 100644
index 0000000000..88979a40b2
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/ContactPage.qml
@@ -0,0 +1,41 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import QtQuick
+import QtQuick.Controls
+
+Page {
+    id: root
+
+    header: ToolBar {
+        Label {
+            text: qsTr("Contacts")
+            font.pixelSize: 20
+            anchors.centerIn: parent
+        }
+    }
+
+    ListView {
+        id: listView
+        anchors.fill: parent
+        topMargin: 48
+        leftMargin: 48
+        bottomMargin: 48
+        rightMargin: 48
+        spacing: 20
+        model: ["Albert Einstein", "Ernest Hemingway", "Hans Gude"]
+        delegate: ItemDelegate {
+            text: modelData
+            width: listView.width - listView.leftMargin - listView.rightMargin
+            height: avatar.implicitHeight
+            leftPadding: avatar.implicitWidth + 32
+            onClicked: root.StackView.view.push("ConversationPage.qml", { inConversationWith: modelData })
+
+            Image {
+                id: avatar
+                source: "images/" + modelData.replace(" ", "_") + ".png"
+            }
+        }
+    }
+}
+
diff --git a/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml b/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml
new file mode 100644
index 0000000000..e61d014e6e
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/ConversationPage.qml
@@ -0,0 +1,96 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+
+Page {
+    id: root
+
+    property string inConversationWith
+
+    header: ToolBar {
+        ToolButton {
+            text: qsTr("Back")
+            anchors.left: parent.left
+            anchors.leftMargin: 10
+            anchors.verticalCenter: parent.verticalCenter
+            onClicked: root.StackView.view.pop()
+        }
+
+        Label {
+            id: pageTitle
+            text: inConversationWith
+            font.pixelSize: 20
+            anchors.centerIn: parent
+        }
+    }
+
+    ColumnLayout {
+        anchors.fill: parent
+
+        ListView {
+            id: listView
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            Layout.margins: pane.leftPadding + messageField.leftPadding
+            displayMarginBeginning: 40
+            displayMarginEnd: 40
+            verticalLayoutDirection: ListView.BottomToTop
+            spacing: 12
+            model: 10
+            delegate: Row {
+                readonly property bool sentByMe: index % 2 == 0
+
+                anchors.right: sentByMe ? listView.contentItem.right : undefined
+                spacing: 6
+
+                Rectangle {
+                    id: avatar
+                    width: height
+                    height: parent.height
+                    color: "grey"
+                    visible: !sentByMe
+                }
+
+                Rectangle {
+                    width: 80
+                    height: 40
+                    color: sentByMe ? "lightgrey" : "steelblue"
+
+                    Label {
+                        anchors.centerIn: parent
+                        text: index
+                        color: sentByMe ? "black" : "white"
+                    }
+                }
+            }
+
+            ScrollBar.vertical: ScrollBar {}
+        }
+
+        Pane {
+            id: pane
+            Layout.fillWidth: true
+
+            RowLayout {
+                width: parent.width
+
+                TextArea {
+                    id: messageField
+                    Layout.fillWidth: true
+                    placeholderText: qsTr("Compose message")
+                    wrapMode: TextArea.Wrap
+                }
+
+                Button {
+                    id: sendButton
+                    text: qsTr("Send")
+                    enabled: messageField.length > 0
+                }
+            }
+        }
+    }
+}
+
diff --git a/examples/quickcontrols/chattutorial/chapter3/chapter3.pro b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
new file mode 100644
index 0000000000..42adc69fe9
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/chapter3.pro
@@ -0,0 +1,29 @@
+TEMPLATE = app
+
+QT += qml quick
+CONFIG += c++11
+
+SOURCES += main.cpp
+
+resources.files = \
+    ContactPage.qml \
+    ConversationPage.qml \
+    images/Albert_Einstein.png \
+    images/Albert_Einstein@2x.png \
+    images/Albert_Einstein@3x.png \
+    images/Albert_Einstein@4x.png \
+    images/Ernest_Hemingway.png \
+    images/Ernest_Hemingway@2x.png \
+    images/Ernest_Hemingway@3x.png \
+    images/Ernest_Hemingway@4x.png \
+    images/Hans_Gude.png \
+    images/Hans_Gude@2x.png \
+    images/Hans_Gude@3x.png \
+    images/Hans_Gude@4x.png \
+    main.qml
+resources.prefix = chapter3/
+RESOURCES += resources \
+    qtquickcontrols2.conf
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter3
+INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein.png
new file mode 100644
index 0000000000..7c44b90b8d
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@2x.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@2x.png
new file mode 100644
index 0000000000..6ce9c39b6c
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@2x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@3x.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@3x.png
new file mode 100644
index 0000000000..aab6a6a162
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@3x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@4x.png b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@4x.png
new file mode 100644
index 0000000000..3611284df4
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Albert_Einstein@4x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway.png
new file mode 100644
index 0000000000..3ac8992fd9
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@2x.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@2x.png
new file mode 100644
index 0000000000..122d9f1e53
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@2x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@3x.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@3x.png
new file mode 100644
index 0000000000..2fe9c2cc1c
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@3x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@4x.png b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@4x.png
new file mode 100644
index 0000000000..96fb6788b5
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Ernest_Hemingway@4x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude.png
new file mode 100644
index 0000000000..907e38bc61
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@2x.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@2x.png
new file mode 100644
index 0000000000..6837796a83
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@2x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@3x.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@3x.png
new file mode 100644
index 0000000000..29af422ad3
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@3x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@4x.png b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@4x.png
new file mode 100644
index 0000000000..bc35eeaa79
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/Hans_Gude@4x.png
diff --git a/examples/quickcontrols/chattutorial/chapter3/images/images.qrc b/examples/quickcontrols/chattutorial/chapter3/images/images.qrc
new file mode 100644
index 0000000000..9eda6aa29c
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/images/images.qrc
@@ -0,0 +1,16 @@
+<RCC>
+    <qresource prefix="/">
+        <file>Albert_Einstein.png</file>
+        <file>Albert_Einstein@2x.png</file>
+        <file>Albert_Einstein@3x.png</file>
+        <file>Albert_Einstein@4x.png</file>
+        <file>Ernest_Hemingway.png</file>
+        <file>Ernest_Hemingway@2x.png</file>
+        <file>Ernest_Hemingway@3x.png</file>
+        <file>Ernest_Hemingway@4x.png</file>
+        <file>Hans_Gude.png</file>
+        <file>Hans_Gude@2x.png</file>
+        <file>Hans_Gude@3x.png</file>
+        <file>Hans_Gude@4x.png</file>
+    </qresource>
+</RCC>
diff --git a/examples/quickcontrols/chattutorial/chapter3/main.cpp b/examples/quickcontrols/chattutorial/chapter3/main.cpp
new file mode 100644
index 0000000000..4347d3ff6c
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/main.cpp
@@ -0,0 +1,16 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    QQmlApplicationEngine engine;
+    engine.load(QUrl(QStringLiteral("qrc:/chapter3/main.qml")));
+
+    return app.exec();
+}
+
diff --git a/examples/quickcontrols/chattutorial/chapter3/main.qml b/examples/quickcontrols/chattutorial/chapter3/main.qml
new file mode 100644
index 0000000000..da080e3a45
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/main.qml
@@ -0,0 +1,19 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import QtQuick
+import QtQuick.Controls
+
+ApplicationWindow {
+    id: window
+    width: 540
+    height: 960
+    visible: true
+
+    StackView {
+        id: stackView
+        anchors.fill: parent
+        initialItem: ContactPage {}
+    }
+}
+
diff --git a/examples/quickcontrols/chattutorial/chapter3/qtquickcontrols2.conf b/examples/quickcontrols/chattutorial/chapter3/qtquickcontrols2.conf
new file mode 100644
index 0000000000..db9486764e
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter3/qtquickcontrols2.conf
@@ -0,0 +1,2 @@
+[Controls]
+Style=Basic