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

diff --git a/tests/manual/quickcontrols/nativestyle/CustomCheckBoxes.qml b/tests/manual/quickcontrols/nativestyle/CustomCheckBoxes.qml
new file mode 100644
index 0000000000..945669a3e5
--- /dev/null
+++ b/tests/manual/quickcontrols/nativestyle/CustomCheckBoxes.qml
@@ -0,0 +1,104 @@
+// 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
+import QtQuick.Controls.impl
+
+ControlContainer {
+    id: container
+    title: "CheckBoxes"
+
+    Row {
+        spacing: container.rowSpacing
+
+        CheckBox {
+            id: customContentItem
+            text: "Custom content item"
+            contentItem: Text {
+                text: customContentItem.text
+                color: "green"
+                leftPadding: customContentItem.indicator.width + customContentItem.spacing
+            }
+        }
+
+        CheckBox {
+            id: customIndicator
+            text: "Custom indicator"
+            indicator: Rectangle {
+                implicitWidth: 15
+                implicitHeight: 15
+
+                x: customIndicator.text ? customIndicator.leftPadding : customIndicator.leftPadding + (customIndicator.availableWidth - width) / 2
+                y: customIndicator.topPadding + (customIndicator.availableHeight - height) / 2
+
+                color: customIndicator.down ? customIndicator.palette.light : customIndicator.palette.base
+                border.color: "green"
+                border.width: 2
+
+                ColorImage {
+                    x: (parent.width - width) / 2
+                    y: (parent.height - height) / 2
+                    defaultColor: "#353637"
+                    scale: 0.5
+                    color: "green"
+                    source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
+                    visible: customIndicator.checkState === Qt.Checked
+                }
+
+                Rectangle {
+                    x: (parent.width - width) / 2
+                    y: (parent.height - height) / 2
+                    width: 16
+                    height: 3
+                    color: customIndicator.palette.text
+                    visible: customIndicator.checkState === Qt.PartiallyChecked
+                }
+            }
+        }
+
+        CheckBox {
+            id: allCustom
+            text: "All custom"
+
+            contentItem: Text {
+                text: allCustom.text
+                color: "green"
+                leftPadding: allCustom.indicator.width + allCustom.spacing
+                rightPadding: allCustom.indicator.width + allCustom.spacing
+            }
+
+            indicator: Rectangle {
+                implicitWidth: 15
+                implicitHeight: 15
+
+                x: allCustom.text ? allCustom.leftPadding : allCustom.leftPadding + (allCustom.availableWidth - width) / 2
+                y: allCustom.topPadding + (allCustom.availableHeight - height) / 2
+
+                color: allCustom.down ? allCustom.palette.light : allCustom.palette.base
+                border.color: "green"
+                border.width: 2
+
+                ColorImage {
+                    x: (parent.width - width) / 2
+                    y: (parent.height - height) / 2
+                    defaultColor: "#353637"
+                    scale: 0.5
+                    color: "green"
+                    source: "qrc:/qt-project.org/imports/QtQuick/Controls/Basic/images/check.png"
+                    visible: allCustom.checkState === Qt.Checked
+                }
+
+                Rectangle {
+                    x: (parent.width - width) / 2
+                    y: (parent.height - height) / 2
+                    width: 16
+                    height: 3
+                    color: "green"
+                    visible: allCustom.checkState === Qt.PartiallyChecked
+                }
+            }
+        }
+    }
+}