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

diff --git a/tests/manual/quickcontrols/nativestyle/CustomSpinBoxes.qml b/tests/manual/quickcontrols/nativestyle/CustomSpinBoxes.qml
new file mode 100644
index 0000000000..eeaee25ea5
--- /dev/null
+++ b/tests/manual/quickcontrols/nativestyle/CustomSpinBoxes.qml
@@ -0,0 +1,138 @@
+// 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.Layouts
+
+ControlContainer {
+    id: container
+    title: "SpinBoxes"
+
+    Row {
+        spacing: container.rowSpacing
+
+        SpinBox {
+            id: custombg
+            value: 1000
+            to: 2000
+            background: Rectangle {
+                border.color: "green"
+                implicitWidth: 50
+            }
+        }
+
+        SpinBox {
+            id: customIndicator
+            value: 500
+            to: 2000
+
+            rightPadding: 17
+            spacing: 0
+            implicitWidth: 60
+            implicitHeight: 25
+
+            up.indicator: Rectangle {
+                x: customIndicator.width - width - 4
+                y: 4
+                implicitWidth: customIndicator.rightPadding - 4
+                implicitHeight: 8
+                border.width: 1
+                border.color: "green"
+                color: customIndicator.up.pressed ? "gray" : "transparent"
+                Text {
+                    text: "+"
+                    font.pixelSize: 8
+                    font.bold: true
+                    anchors.centerIn: parent
+                }
+            }
+
+            down.indicator: Rectangle {
+                x: customIndicator.width - width - 4
+                y: height + 6
+                implicitWidth: customIndicator.rightPadding - 4
+                implicitHeight: 8
+                border.width: 1
+                border.color: "green"
+                color: customIndicator.down.pressed ? "gray" : "transparent"
+                Text {
+                    text: "-"
+                    font.pixelSize: 10
+                    font.bold: true
+                    anchors.centerIn: parent
+                }
+            }
+        }
+
+        SpinBox {
+            id: allCustom
+            value: 500
+            to: 2000
+
+            rightPadding: 17
+            spacing: 0
+            implicitWidth: 60
+            implicitHeight: 25
+
+            background: Rectangle {
+                border.color: "green"
+                implicitWidth: 50
+            }
+
+            up.indicator: Rectangle {
+                x: allCustom.width - width - 4
+                y: 4
+                implicitWidth: allCustom.rightPadding - 4
+                implicitHeight: 8
+                border.width: 1
+                border.color: "green"
+                color: allCustom.up.pressed ? "gray" : "transparent"
+                Text {
+                    text: "+"
+                    font.pixelSize: 8
+                    font.bold: true
+                    anchors.centerIn: parent
+                }
+            }
+
+            down.indicator: Rectangle {
+                x: allCustom.width - width - 4
+                y: height + 6
+                implicitWidth: allCustom.rightPadding - 4
+                implicitHeight: 8
+                border.width: 1
+                border.color: "green"
+                color: allCustom.down.pressed ? "gray" : "transparent"
+                Text {
+                    text: "-"
+                    font.pixelSize: 10
+                    font.bold: true
+                    anchors.centerIn: parent
+                }
+            }
+
+            contentItem: TextInput {
+                text: allCustom.displayText
+                font: allCustom.font
+                color: "green"
+                selectionColor: allCustom.palette.highlight
+                selectedTextColor: allCustom.palette.highlightedText
+                horizontalAlignment: Qt.AlignLeft
+                verticalAlignment: Qt.AlignVCenter
+
+                topPadding: 2
+                bottomPadding: 2
+                leftPadding: 10
+                rightPadding: 10
+
+                readOnly: !allCustom.editable
+                validator: allCustom.validator
+                inputMethodHints: allCustom.inputMethodHints
+            }
+
+        }
+
+    }
+
+}