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>

1 files changed, 179 insertions, 0 deletions

diff --git a/examples/quickcontrols/gallery/pages/DialogPage.qml b/examples/quickcontrols/gallery/pages/DialogPage.qml
new file mode 100644
index 0000000000..982a7f38d4
--- /dev/null
+++ b/examples/quickcontrols/gallery/pages/DialogPage.qml
@@ -0,0 +1,179 @@
+// 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
+
+ScrollablePage {
+    id: page
+
+    readonly property int buttonWidth: Math.max(button.implicitWidth, Math.min(button.implicitWidth * 2, page.availableWidth / 3))
+
+    Column {
+        spacing: 40
+        width: parent.width
+
+        Label {
+            width: parent.width
+            wrapMode: Label.Wrap
+            horizontalAlignment: Qt.AlignHCenter
+            text: "Dialog is a popup that is mostly used for short-term tasks "
+                + "and brief communications with the user."
+        }
+
+        Button {
+            text: "Message"
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: buttonWidth
+            onClicked: messageDialog.open()
+
+            Dialog {
+                id: messageDialog
+
+                x: (parent.width - width) / 2
+                y: (parent.height - height) / 2
+
+                title: "Message"
+
+                Label {
+                    text: "Lorem ipsum dolor sit amet..."
+                }
+            }
+        }
+
+        Button {
+            id: button
+            text: "Confirmation"
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: buttonWidth
+            onClicked: confirmationDialog.open()
+
+            Dialog {
+                id: confirmationDialog
+
+                x: (parent.width - width) / 2
+                y: (parent.height - height) / 2
+                parent: Overlay.overlay
+
+                modal: true
+                title: "Confirmation"
+                standardButtons: Dialog.Yes | Dialog.No
+
+                Column {
+                    spacing: 20
+                    anchors.fill: parent
+                    Label {
+                        text: "The document has been modified.\nDo you want to save your changes?"
+                    }
+                    CheckBox {
+                        text: "Do not ask again"
+                        anchors.right: parent.right
+                    }
+                }
+            }
+        }
+
+        Button {
+            text: "Content"
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: buttonWidth
+            onClicked: contentDialog.open()
+
+            Dialog {
+                id: contentDialog
+
+                x: (parent.width - width) / 2
+                y: (parent.height - height) / 2
+                width: Math.min(page.width, page.height) / 3 * 2
+                contentHeight: logo.height * 2
+                parent: Overlay.overlay
+
+                modal: true
+                title: "Content"
+                standardButtons: Dialog.Close
+
+                Flickable {
+                    id: flickable
+                    clip: true
+                    anchors.fill: parent
+                    contentHeight: column.height
+
+                    Column {
+                        id: column
+                        spacing: 20
+                        width: parent.width
+
+                        Image {
+                            id: logo
+                            width: parent.width / 2
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            fillMode: Image.PreserveAspectFit
+                            source: "../images/qt-logo.png"
+                        }
+
+                        Label {
+                            width: parent.width
+                            text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc finibus "
+                                + "in est quis laoreet. Interdum et malesuada fames ac ante ipsum primis "
+                                + "in faucibus. Curabitur eget justo sollicitudin enim faucibus bibendum. "
+                                + "Suspendisse potenti. Vestibulum cursus consequat mauris id sollicitudin. "
+                                + "Duis facilisis hendrerit consectetur. Curabitur sapien tortor, efficitur "
+                                + "id auctor nec, efficitur et nisl. Ut venenatis eros in nunc placerat, "
+                                + "eu aliquam enim suscipit."
+                            wrapMode: Label.Wrap
+                        }
+                    }
+
+                    ScrollIndicator.vertical: ScrollIndicator {
+                        parent: contentDialog.contentItem
+                        anchors.top: flickable.top
+                        anchors.bottom: flickable.bottom
+                        anchors.right: parent.right
+                        anchors.rightMargin: -contentDialog.rightPadding + 1
+                    }
+                }
+            }
+        }
+
+        Button {
+            text: "Input"
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: buttonWidth
+            onClicked: inputDialog.open()
+
+            Dialog {
+                id: inputDialog
+
+                x: (parent.width - width) / 2
+                y: (parent.height - height) / 2
+                parent: Overlay.overlay
+
+                focus: true
+                modal: true
+                title: "Input"
+                standardButtons: Dialog.Ok | Dialog.Cancel
+
+                ColumnLayout {
+                    spacing: 20
+                    anchors.fill: parent
+                    Label {
+                        elide: Label.ElideRight
+                        text: "Please enter the credentials:"
+                        Layout.fillWidth: true
+                    }
+                    TextField {
+                        focus: true
+                        placeholderText: "Username"
+                        Layout.fillWidth: true
+                    }
+                    TextField {
+                        placeholderText: "Password"
+                        echoMode: TextField.PasswordEchoOnEdit
+                        Layout.fillWidth: true
+                    }
+                }
+            }
+        }
+    }
+}