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 <[email protected]>

18 files changed, 165 insertions, 0 deletions

diff --git a/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
new file mode 100644
index 0000000000..c011336802
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/CMakeLists.txt
@@ -0,0 +1,59 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+cmake_minimum_required(VERSION 3.16)
+project(chapter2 LANGUAGES CXX)
+
+set(CMAKE_AUTOMOC ON)
+
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+    set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quickcontrols2/chattutorial/chapter2")
+
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick)
+
+qt_add_executable(chattutorial-chapter2 WIN32 MACOSX_BUNDLE
+    main.cpp
+)
+
+target_link_libraries(chattutorial-chapter2 PRIVATE
+    Qt::Core
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+)
+
+qt_add_qml_module(chattutorial-chapter2
+    URI chapter2
+    VERSION 1.0
+    QML_FILES
+        "main.qml"
+    RESOURCES
+        "images/Albert_Einstein.png"
+        "images/[email protected]"
+        "images/[email protected]"
+        "images/[email protected]"
+        "images/Ernest_Hemingway.png"
+        "images/[email protected]"
+        "images/[email protected]"
+        "images/[email protected]"
+        "images/Hans_Gude.png"
+        "images/[email protected]"
+        "images/[email protected]"
+        "images/[email protected]"
+)
+
+qt6_add_resources(chattutorial-chapter2 "conf"
+    PREFIX
+        "/"
+    FILES
+        "qtquickcontrols2.conf"
+)
+
+install(TARGETS chattutorial-chapter2
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
+)
diff --git a/examples/quickcontrols/chattutorial/chapter2/chapter2.pro b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
new file mode 100644
index 0000000000..15429b7c89
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/chapter2.pro
@@ -0,0 +1,27 @@
+TEMPLATE = app
+
+QT += qml quick
+CONFIG += c++11
+
+SOURCES += main.cpp
+
+resources.files = \
+    images/Albert_Einstein.png \
+    images/[email protected] \
+    images/[email protected] \
+    images/[email protected] \
+    images/Ernest_Hemingway.png \
+    images/[email protected] \
+    images/[email protected] \
+    images/[email protected] \
+    images/Hans_Gude.png \
+    images/[email protected] \
+    images/[email protected] \
+    images/[email protected] \
+    main.qml
+resources.prefix = chapter2/
+RESOURCES += resources \
+    qtquickcontrols2.conf
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/chattutorial/chapter2
+INSTALLS += target
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein.png b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein.png
new file mode 100644
index 0000000000..7c44b90b8d
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Albert_Einstein.png
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..6ce9c39b6c
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..aab6a6a162
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..3611284df4
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway.png b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway.png
new file mode 100644
index 0000000000..3ac8992fd9
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Ernest_Hemingway.png
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..122d9f1e53
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..2fe9c2cc1c
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..96fb6788b5
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude.png b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude.png
new file mode 100644
index 0000000000..907e38bc61
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/Hans_Gude.png
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..6837796a83
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..29af422ad3
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/[email protected] b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
new file mode 100644
index 0000000000..bc35eeaa79
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/[email protected]
diff --git a/examples/quickcontrols/chattutorial/chapter2/images/images.qrc b/examples/quickcontrols/chattutorial/chapter2/images/images.qrc
new file mode 100644
index 0000000000..9eda6aa29c
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/images/images.qrc
@@ -0,0 +1,16 @@
+<RCC>
+    <qresource prefix="/">
+        <file>Albert_Einstein.png</file>
+        <file>[email protected]</file>
+        <file>[email protected]</file>
+        <file>[email protected]</file>
+        <file>Ernest_Hemingway.png</file>
+        <file>[email protected]</file>
+        <file>[email protected]</file>
+        <file>[email protected]</file>
+        <file>Hans_Gude.png</file>
+        <file>[email protected]</file>
+        <file>[email protected]</file>
+        <file>[email protected]</file>
+    </qresource>
+</RCC>
diff --git a/examples/quickcontrols/chattutorial/chapter2/main.cpp b/examples/quickcontrols/chattutorial/chapter2/main.cpp
new file mode 100644
index 0000000000..eeb87becca
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/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:/chapter2/main.qml")));
+
+    return app.exec();
+}
+
diff --git a/examples/quickcontrols/chattutorial/chapter2/main.qml b/examples/quickcontrols/chattutorial/chapter2/main.qml
new file mode 100644
index 0000000000..851b482b01
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/main.qml
@@ -0,0 +1,45 @@
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+import QtQuick
+import QtQuick.Controls
+
+ApplicationWindow {
+    width: 540
+    height: 960
+    visible: true
+
+    Page {
+        anchors.fill: parent
+        header: Label {
+            padding: 10
+            text: qsTr("Contacts")
+            font.pixelSize: 20
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        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
+
+                Image {
+                    id: avatar
+                    source: "images/" + modelData.replace(" ", "_") + ".png"
+                }
+            }
+        }
+    }
+}
+
diff --git a/examples/quickcontrols/chattutorial/chapter2/qtquickcontrols2.conf b/examples/quickcontrols/chattutorial/chapter2/qtquickcontrols2.conf
new file mode 100644
index 0000000000..db9486764e
--- /dev/null
+++ b/examples/quickcontrols/chattutorial/chapter2/qtquickcontrols2.conf
@@ -0,0 +1,2 @@
+[Controls]
+Style=Basic