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]>

1 files changed, 28 insertions, 0 deletions

diff --git a/src/quickcontrols/macos/GroupBox.qml b/src/quickcontrols/macos/GroupBox.qml
new file mode 100644
index 0000000000..38c82891a1
--- /dev/null
+++ b/src/quickcontrols/macos/GroupBox.qml
@@ -0,0 +1,28 @@
+// 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.NativeStyle as NativeStyle
+
+NativeStyle.DefaultGroupBox {
+    id: control
+    font.pixelSize: background.styleFont(control).pixelSize
+    label: Item {
+        readonly property point labelPos : control.__nativeBackground
+                                  ? background.labelPos
+                                  : Qt.point(0,0)
+        x: labelPos.x + background.x
+        y: labelPos.y + background.y - (control.__nativeBackground ? background.groupBoxPadding.top : 0)
+        width: children[0].implicitWidth
+        height: children[0].implicitHeight
+        Text {
+            width: parent.width
+            height: parent.height
+            text: control.title
+            font: control.font
+            color: control.palette.windowText
+            elide: Text.ElideRight
+            verticalAlignment: Text.AlignVCenter
+        }
+    }
+}