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

diff --git a/src/quickcontrols/macos/SpinBox.qml b/src/quickcontrols/macos/SpinBox.qml
new file mode 100644
index 0000000000..9f10a08e55
--- /dev/null
+++ b/src/quickcontrols/macos/SpinBox.qml
@@ -0,0 +1,66 @@
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+import QtQuick
+import QtQuick.Templates as T
+import QtQuick.NativeStyle as NativeStyle
+
+T.SpinBox {
+    id: control
+
+    implicitWidth: Math.max(implicitContentWidth + leftInset + rightInset)
+    implicitHeight: Math.max(implicitContentHeight, up.implicitIndicatorHeight + down.implicitIndicatorHeight)
+                    + topInset + bottomInset
+
+    spacing: 2
+    rightPadding: up.implicitIndicatorWidth + spacing
+
+    validator: IntValidator {
+        locale: control.locale.name
+        bottom: Math.min(control.from, control.to)
+        top: Math.max(control.from, control.to)
+    }
+
+    contentItem: TextField {
+        text: control.displayText
+        font: control.font
+        color: control.palette.text
+        selectionColor: control.palette.highlight
+        selectedTextColor: control.palette.highlightedText
+        horizontalAlignment: Qt.AlignLeft
+        verticalAlignment: Qt.AlignVCenter
+        implicitWidth: 100 // From IB XCode
+
+        topPadding: 2
+        bottomPadding: 2
+        leftPadding: 10
+        rightPadding: 10
+
+        readOnly: !control.editable
+        validator: control.validator
+        inputMethodHints: control.inputMethodHints
+    }
+
+    NativeStyle.SpinBox {
+        id: upAndDown
+        control: control
+        subControl: NativeStyle.SpinBox.Up
+        x: up.indicator.x
+        y: up.indicator.y
+        useNinePatchImage: false
+    }
+
+    up.indicator: Item {
+        x: parent.width - width
+        y: (parent.height / 2) - height
+        implicitWidth: upAndDown.width
+        implicitHeight: upAndDown.height / 2
+    }
+
+    down.indicator: Item {
+        x: parent.width - width
+        y: up.indicator.y + upAndDown.height / 2
+        implicitWidth: upAndDown.width
+        implicitHeight: upAndDown.height / 2
+    }
+}