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, 54 insertions, 0 deletions

diff --git a/tests/manual/quickcontrols/nativestyle/CustomDials.qml b/tests/manual/quickcontrols/nativestyle/CustomDials.qml
new file mode 100644
index 0000000000..5a96741a7b
--- /dev/null
+++ b/tests/manual/quickcontrols/nativestyle/CustomDials.qml
@@ -0,0 +1,54 @@
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.Basic.impl
+import QtQuick.Layouts
+
+ControlContainer {
+    id: container
+    title: "Dials"
+
+    Row {
+        spacing: container.rowSpacing
+
+        Dial {
+            id: dial1
+            width: 50
+            height: 50
+            from: 0
+            to: 10
+            value: 5
+
+            background: DialImpl {
+                implicitWidth: 184
+                implicitHeight: 184
+                color: "darkgray"
+                progress: dial1.position
+                opacity: dial1.enabled ? 1 : 0.3
+            }
+
+            handle: ColorImage {
+                x: dial1.background.x + dial1.background.width / 2 - width / 2
+                y: dial1.background.y + dial1.background.height / 2 - height / 2
+                width: 14
+                height: 10
+                color: "green"
+                source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/dial-indicator.png"
+                antialiasing: true
+                opacity: dial1.enabled ? 1 : 0.3
+                transform: [
+                    Translate {
+                        y: -Math.min(dial1.background.width, dial1.background.height) * 0.4 + dial1.handle.height / 2
+                    },
+                    Rotation {
+                        angle: dial1.angle
+                        origin.x: dial1.handle.width / 2
+                        origin.y: dial1.handle.height / 2
+                    }
+                ]
+            }
+        }
+    }
+}